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

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security 

Pull SElinux fix from James Morris:
 "From Paul:
   'A small SELinux patch to fix some clang/llvm compiler warnings and
    ensure the tools under scripts work well in the face of kernel
    changes'"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  selinux: use the kernel headers when building scripts/selinux
parents eb254f32 bfc5e3a6

scripts/selinux/genheaders/Makefile

+3 −1
Original line number Diff line number Diff line 
hostprogs-y	:= genheaders

HOST_EXTRACFLAGS += -Isecurity/selinux/include

HOST_EXTRACFLAGS += \

	-I$(srctree)/include/uapi -I$(srctree)/include \

	-I$(srctree)/security/selinux/include



always		:= $(hostprogs-y)

scripts/selinux/genheaders/genheaders.c

+4 −0
Original line number Diff line number Diff line 


/* NOTE: we really do want to use the kernel headers here */

#define __EXPORTED_HEADERS__



#include <stdio.h>

#include <stdlib.h>

#include <unistd.h>

scripts/selinux/mdp/Makefile

+3 −1
Original line number Diff line number Diff line 
hostprogs-y	:= mdp

HOST_EXTRACFLAGS += -Isecurity/selinux/include

HOST_EXTRACFLAGS += \

	-I$(srctree)/include/uapi -I$(srctree)/include \

	-I$(srctree)/security/selinux/include



always		:= $(hostprogs-y)

clean-files	:= policy.* file_contexts

scripts/selinux/mdp/mdp.c

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ 
 * Authors: Serge E. Hallyn <serue@us.ibm.com>

 */





/* NOTE: we really do want to use the kernel headers here */

#define __EXPORTED_HEADERS__



#include <stdio.h>

#include <stdlib.h>

#include <unistd.h>

security/selinux/include/classmap.h

+2 −0
Original line number Diff line number Diff line 
#include <linux/capability.h>



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

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