Skip to content

Commit

Permalink
Merge tag 'selinux-pr-20190429' of git://git.kernel.org/pub/scm/linux…
Browse files Browse the repository at this point in the history
…/kernel/git/pcmoore/selinux

Pull selinux fix from Paul Moore:
 "One small patch for the stable folks to fix a problem when building
  against the latest glibc.

  I'll be honest and say that I'm not really thrilled with the idea of
  sending this up right now, but Greg is a little annoyed so here I
  figured I would at least send this"

* tag 'selinux-pr-20190429' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
  selinux: use kernel linux/socket.h for genheaders and mdp
  • Loading branch information
torvalds committed Apr 30, 2019
2 parents 83a5084 + dfbd199 commit fea27bc
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion scripts/selinux/genheaders/genheaders.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <string.h>
#include <errno.h>
#include <ctype.h>
#include <sys/socket.h>

struct security_class_mapping {
const char *name;
Expand Down
1 change: 0 additions & 1 deletion scripts/selinux/mdp/mdp.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <sys/socket.h>

static void usage(char *name)
{
Expand Down
1 change: 1 addition & 0 deletions security/selinux/include/classmap.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */
#include <linux/capability.h>
#include <linux/socket.h>

#define COMMON_FILE_SOCK_PERMS "ioctl", "read", "write", "create", \
"getattr", "setattr", "lock", "relabelfrom", "relabelto", "append", "map"
Expand Down

0 comments on commit fea27bc

Please sign in to comment.