]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
selinux: use kernel linux/socket.h for genheaders and mdp
authorPaulo Alcantara <paulo@paulo.ac>
Thu, 6 Jun 2019 13:03:00 +0000 (15:03 +0200)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Tue, 2 Jul 2019 12:18:49 +0000 (14:18 +0200)
commitf2190a0333027137aae7efcf3116e7fede4fc6e0
treeb211170273045858b52d882d6d02242739a4f1f3
parenta4b345da1d0953892f13f57aea67504e6825ec0b
selinux: use kernel linux/socket.h for genheaders and mdp

BugLink: https://bugs.launchpad.net/bugs/1823429
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>
(cherry picked from commit dfbd199a7cfe3e3cd8531e1353cdbd7175bfbc5e)
Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
[ kleber: fix BugLink reference. ]
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
scripts/selinux/genheaders/genheaders.c
scripts/selinux/mdp/mdp.c
security/selinux/include/classmap.h