Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fea27bc7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'selinux-pr-20190429' of git://git.kernel.org/pub/scm/linux/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
parents 83a50840 dfbd199a

scripts/selinux/genheaders/genheaders.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <string.h>

#include <string.h>

#include <errno.h>

#include <errno.h>

#include <ctype.h>

#include <ctype.h>

#include <sys/socket.h>





struct security_class_mapping {

struct security_class_mapping {

	const char *name;

	const char *name;

scripts/selinux/mdp/mdp.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <stdlib.h>

#include <stdlib.h>

#include <unistd.h>

#include <unistd.h>

#include <string.h>

#include <string.h>

#include <sys/socket.h>





static void usage(char *name)

static void usage(char *name)

{

{

security/selinux/include/classmap.h

+1 −0
Original line number Original line Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* SPDX-License-Identifier: GPL-2.0 */

#include <linux/capability.h>

#include <linux/capability.h>

#include <linux/socket.h>





#define COMMON_FILE_SOCK_PERMS "ioctl", "read", "write", "create", \

#define COMMON_FILE_SOCK_PERMS "ioctl", "read", "write", "create", \

    "getattr", "setattr", "lock", "relabelfrom", "relabelto", "append", "map"

    "getattr", "setattr", "lock", "relabelfrom", "relabelto", "append", "map"