- 4.14.200

[packages/kernel.git] / kernel-small_fixes.patch

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index e56acbbc763e93336a2fc5e4d60c17e675b58f1e..a227229931d63172b9dc579d98a0799465ecca09 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -26,29 +26,18 @@
                                exit
                        fi
                done
-commit 80d172431696482d9acd8d2c4ea78fed8956e2a1
-Author: valdis.kletnieks@vt.edu <valdis.kletnieks@vt.edu>
-Date:   Sun Feb 4 12:01:43 2018 -0500
-
-    gcc-plugins: Add include required by GCC release 8
-    
-    GCC requires another #include to get the gcc-plugins to build cleanly.
-    
-    Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
-    Signed-off-by: Kees Cook <keescook@chromium.org>
-
-diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h
-index ffd1dfaa1cc1..f46750053377 100644
---- a/scripts/gcc-plugins/gcc-common.h
-+++ b/scripts/gcc-plugins/gcc-common.h
-@@ -97,6 +97,10 @@
- #include "predict.h"
- #include "ipa-utils.h"
+--- linux-4.14/security/selinux/include/classmap.h     2017-11-12 19:46:13.000000000 +0100
++++ linux-4.20/security/selinux/include/classmap.h     2018-12-24 00:55:59.000000000 +0100
+@@ -238,9 +238,11 @@
+         { "access", NULL } },
+       { "infiniband_endport",
+         { "manage_subnet", NULL } },
++      { "xdp_socket",
++        { COMMON_SOCK_PERMS, NULL } },
+       { NULL }
+   };
  
-+#if BUILDING_GCC_VERSION >= 8000
-+#include "stringpool.h"
-+#endif
-+
- #if BUILDING_GCC_VERSION >= 4009
- #include "attribs.h"
- #include "varasm.h"
+-#if PF_MAX > 44
++#if PF_MAX > 45
+ #error New address family defined, please update secclass_map.
+ #endif