]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
selinux: use kernel linux/socket.h for genheaders and mdp
authorPaulo Alcantara <paulo@paulo.ac>
Mon, 25 Feb 2019 00:55:28 +0000 (21:55 -0300)
committerPaul Moore <paul@paul-moore.com>
Mon, 29 Apr 2019 15:34:58 +0000 (11:34 -0400)
commitdfbd199a7cfe3e3cd8531e1353cdbd7175bfbc5e
tree527947e637ba6820d179d9c107840e4964490358
parent6a1afffb08ce5f9fb9ccc20f7ab24846c0142984
selinux: use kernel linux/socket.h for genheaders and mdp

When compiling genheaders and mdp from a newer host kernel, the
following error happens:

    In file included from scripts/selinux/genheaders/genheaders.c:18:
    ./security/selinux/include/classmap.h:238:2: error: #error New
    address family defined, please update secclass_map.  #error New
    address family defined, please update secclass_map.  ^~~~~
    make[3]: *** [scripts/Makefile.host:107:
    scripts/selinux/genheaders/genheaders] Error 1 make[2]: ***
    [scripts/Makefile.build:599: scripts/selinux/genheaders] Error 2
    make[1]: *** [scripts/Makefile.build:599: scripts/selinux] Error 2
    make[1]: *** Waiting for unfinished jobs....

Instead of relying on the host definition, include linux/socket.h in
classmap.h to have PF_MAX.

Cc: stable@vger.kernel.org
Signed-off-by: Paulo Alcantara <paulo@paulo.ac>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
[PM: manually merge in mdp.c, subject line tweaks]
Signed-off-by: Paul Moore <paul@paul-moore.com>
scripts/selinux/genheaders/genheaders.c
scripts/selinux/mdp/mdp.c
security/selinux/include/classmap.h