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

Commit bfc5e3a6 authored by Paul Moore's avatar Paul Moore
Browse files

selinux: use the kernel headers when building scripts/selinux 



Commit 3322d0d6 ("selinux: keep SELinux in sync with new capability
definitions") added a check on the defined capabilities without
explicitly including the capability header file which caused problems
when building genheaders for users of clang/llvm.  Resolve this by
using the kernel headers when building genheaders, which is arguably
the right thing to do regardless, and explicitly including the
kernel's capability.h header file in classmap.h.  We also update the
mdp build, even though it wasn't causing an error we really should
be using the headers from the kernel we are building.

Reported-by: default avatarNicolas Iooss <nicolas.iooss@m4x.org>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 9287aed2

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"