| Message ID | 20190606130312.30510-1-xnox@ubuntu.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,Bionic] selinux: use kernel linux/socket.h for genheaders and mdp | expand |
On 6/6/19 3:03 PM, Dimitri John Ledkov wrote: > From: Paulo Alcantara <paulo@paulo.ac> > > BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1823429 BugLink should be in the format https://bugs.launchpad.net/bugs/[bug id] so for this patch it should be 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> With the changes to the BugLink URL: Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> Thank you, Kleber > --- > scripts/selinux/genheaders/genheaders.c | 1 - > scripts/selinux/mdp/mdp.c | 1 - > security/selinux/include/classmap.h | 1 + > 3 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c > index fa48fabcb330..3cc4893d98cc 100644 > --- a/scripts/selinux/genheaders/genheaders.c > +++ b/scripts/selinux/genheaders/genheaders.c > @@ -9,7 +9,6 @@ > #include <string.h> > #include <errno.h> > #include <ctype.h> > -#include <sys/socket.h> > > struct security_class_mapping { > const char *name; > diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c > index ffe8179f5d41..c29fa4a6228d 100644 > --- a/scripts/selinux/mdp/mdp.c > +++ b/scripts/selinux/mdp/mdp.c > @@ -32,7 +32,6 @@ > #include <stdlib.h> > #include <unistd.h> > #include <string.h> > -#include <sys/socket.h> > > static void usage(char *name) > { > diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h > index acdee7795297..5ae315ab060b 100644 > --- a/security/selinux/include/classmap.h > +++ b/security/selinux/include/classmap.h > @@ -1,5 +1,6 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > #include <linux/capability.h> > +#include <linux/socket.h> > > #define COMMON_FILE_SOCK_PERMS "ioctl", "read", "write", "create", \ > "getattr", "setattr", "lock", "relabelfrom", "relabelto", "append", "map" >
On 06.06.19 15:03, Dimitri John Ledkov wrote: > From: Paulo Alcantara <paulo@paulo.ac> > > BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/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> Acked-by: Stefan Bader <stefan.bader@canonical.com> > --- With modifying bugref on commit > scripts/selinux/genheaders/genheaders.c | 1 - > scripts/selinux/mdp/mdp.c | 1 - > security/selinux/include/classmap.h | 1 + > 3 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c > index fa48fabcb330..3cc4893d98cc 100644 > --- a/scripts/selinux/genheaders/genheaders.c > +++ b/scripts/selinux/genheaders/genheaders.c > @@ -9,7 +9,6 @@ > #include <string.h> > #include <errno.h> > #include <ctype.h> > -#include <sys/socket.h> > > struct security_class_mapping { > const char *name; > diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c > index ffe8179f5d41..c29fa4a6228d 100644 > --- a/scripts/selinux/mdp/mdp.c > +++ b/scripts/selinux/mdp/mdp.c > @@ -32,7 +32,6 @@ > #include <stdlib.h> > #include <unistd.h> > #include <string.h> > -#include <sys/socket.h> > > static void usage(char *name) > { > diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h > index acdee7795297..5ae315ab060b 100644 > --- a/security/selinux/include/classmap.h > +++ b/security/selinux/include/classmap.h > @@ -1,5 +1,6 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > #include <linux/capability.h> > +#include <linux/socket.h> > > #define COMMON_FILE_SOCK_PERMS "ioctl", "read", "write", "create", \ > "getattr", "setattr", "lock", "relabelfrom", "relabelto", "append", "map" >
On 6/6/19 3:03 PM, Dimitri John Ledkov wrote: > From: Paulo Alcantara <paulo@paulo.ac> > > BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/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> Applied to bionic/master-next branch, fixing the BugLink reference. Thanks, Kleber > --- > scripts/selinux/genheaders/genheaders.c | 1 - > scripts/selinux/mdp/mdp.c | 1 - > security/selinux/include/classmap.h | 1 + > 3 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c > index fa48fabcb330..3cc4893d98cc 100644 > --- a/scripts/selinux/genheaders/genheaders.c > +++ b/scripts/selinux/genheaders/genheaders.c > @@ -9,7 +9,6 @@ > #include <string.h> > #include <errno.h> > #include <ctype.h> > -#include <sys/socket.h> > > struct security_class_mapping { > const char *name; > diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c > index ffe8179f5d41..c29fa4a6228d 100644 > --- a/scripts/selinux/mdp/mdp.c > +++ b/scripts/selinux/mdp/mdp.c > @@ -32,7 +32,6 @@ > #include <stdlib.h> > #include <unistd.h> > #include <string.h> > -#include <sys/socket.h> > > static void usage(char *name) > { > diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h > index acdee7795297..5ae315ab060b 100644 > --- a/security/selinux/include/classmap.h > +++ b/security/selinux/include/classmap.h > @@ -1,5 +1,6 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > #include <linux/capability.h> > +#include <linux/socket.h> > > #define COMMON_FILE_SOCK_PERMS "ioctl", "read", "write", "create", \ > "getattr", "setattr", "lock", "relabelfrom", "relabelto", "append", "map" >
diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c index fa48fabcb330..3cc4893d98cc 100644 --- a/scripts/selinux/genheaders/genheaders.c +++ b/scripts/selinux/genheaders/genheaders.c @@ -9,7 +9,6 @@ #include <string.h> #include <errno.h> #include <ctype.h> -#include <sys/socket.h> struct security_class_mapping { const char *name; diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c index ffe8179f5d41..c29fa4a6228d 100644 --- a/scripts/selinux/mdp/mdp.c +++ b/scripts/selinux/mdp/mdp.c @@ -32,7 +32,6 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> -#include <sys/socket.h> static void usage(char *name) { diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h index acdee7795297..5ae315ab060b 100644 --- a/security/selinux/include/classmap.h +++ b/security/selinux/include/classmap.h @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ #include <linux/capability.h> +#include <linux/socket.h> #define COMMON_FILE_SOCK_PERMS "ioctl", "read", "write", "create", \ "getattr", "setattr", "lock", "relabelfrom", "relabelto", "append", "map"