From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 2 May 2019 08:07:45 +0000 (+0200)
Subject: 4.14-stable patches
X-Git-Tag: v4.9.173~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f9600761fef522bf5e391465f65a9d1f1dad146;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	selinux-use-kernel-linux-socket.h-for-genheaders-and-mdp.patch
---

diff --git a/queue-4.14/selinux-use-kernel-linux-socket.h-for-genheaders-and-mdp.patch b/queue-4.14/selinux-use-kernel-linux-socket.h-for-genheaders-and-mdp.patch
new file mode 100644
index 00000000000..ae6876b20cf
--- /dev/null
+++ b/queue-4.14/selinux-use-kernel-linux-socket.h-for-genheaders-and-mdp.patch
@@ -0,0 +1,67 @@
+From dfbd199a7cfe3e3cd8531e1353cdbd7175bfbc5e Mon Sep 17 00:00:00 2001
+From: Paulo Alcantara <paulo@paulo.ac>
+Date: Sun, 24 Feb 2019 21:55:28 -0300
+Subject: selinux: use kernel linux/socket.h for genheaders and mdp
+
+From: Paulo Alcantara <paulo@paulo.ac>
+
+commit dfbd199a7cfe3e3cd8531e1353cdbd7175bfbc5e upstream.
+
+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>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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(-)
+
+--- 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;
+--- 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)
+ {
+--- 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/queue-4.14/series b/queue-4.14/series
new file mode 100644
index 00000000000..8495c3ed8e5
--- /dev/null
+++ b/queue-4.14/series
@@ -0,0 +1 @@
+selinux-use-kernel-linux-socket.h-for-genheaders-and-mdp.patch
diff --git a/queue-4.19/series b/queue-4.19/series
new file mode 100644
index 00000000000..8495c3ed8e5
--- /dev/null
+++ b/queue-4.19/series
@@ -0,0 +1 @@
+selinux-use-kernel-linux-socket.h-for-genheaders-and-mdp.patch
diff --git a/queue-4.9/series b/queue-4.9/series
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/queue-5.0/series b/queue-5.0/series
new file mode 100644
index 00000000000..8495c3ed8e5
--- /dev/null
+++ b/queue-5.0/series
@@ -0,0 +1 @@
+selinux-use-kernel-linux-socket.h-for-genheaders-and-mdp.patch