- 4.14.69

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 8c81938c5e3f6b78d1cacb834530e24ead32beca..d4b603499b05f64e51b96e527678c26a94700ef8 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -26,195 +26,3 @@
                                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"
- 
-+#if BUILDING_GCC_VERSION >= 8000
-+#include "stringpool.h"
-+#endif
-+
- #if BUILDING_GCC_VERSION >= 4009
- #include "attribs.h"
- #include "varasm.h"
-diff -ur linux-4.14/scripts/gcc-plugins/latent_entropy_plugin.c linux-4.17/scripts/gcc-plugins/latent_entropy_plugin.c
---- linux-4.14/scripts/gcc-plugins/latent_entropy_plugin.c     2017-11-12 19:46:13.000000000 +0100
-+++ linux-4.17/scripts/gcc-plugins/latent_entropy_plugin.c     2018-06-03 23:15:21.000000000 +0200
-@@ -255,21 +255,14 @@
-       return NULL_TREE;
- }
- 
--static struct attribute_spec latent_entropy_attr = {
--      .name                           = "latent_entropy",
--      .min_length                     = 0,
--      .max_length                     = 0,
--      .decl_required                  = true,
--      .type_required                  = false,
--      .function_type_required         = false,
--      .handler                        = handle_latent_entropy_attribute,
--#if BUILDING_GCC_VERSION >= 4007
--      .affects_type_identity          = false
--#endif
--};
-+static struct attribute_spec latent_entropy_attr = { };
- 
- static void register_attributes(void *event_data __unused, void *data __unused)
- {
-+      latent_entropy_attr.name                = "latent_entropy";
-+      latent_entropy_attr.decl_required       = true;
-+      latent_entropy_attr.handler             = handle_latent_entropy_attribute;
-+
-       register_attribute(&latent_entropy_attr);
- }
- 
-diff -ur linux-4.14/scripts/gcc-plugins/randomize_layout_plugin.c linux-4.17/scripts/gcc-plugins/randomize_layout_plugin.c
---- linux-4.14/scripts/gcc-plugins/randomize_layout_plugin.c   2017-11-12 19:46:13.000000000 +0100
-+++ linux-4.17/scripts/gcc-plugins/randomize_layout_plugin.c   2018-06-03 23:15:21.000000000 +0200
-@@ -52,8 +52,8 @@
-       { "net/unix/af_unix.c", "unix_skb_parms", "char" },
-       /* big_key payload.data struct splashing */
-       { "security/keys/big_key.c", "path", "void *" },
--      /* walk struct security_hook_heads as an array of struct list_head */
--      { "security/security.c", "list_head", "security_hook_heads" },
-+      /* walk struct security_hook_heads as an array of struct hlist_head */
-+      { "security/security.c", "hlist_head", "security_hook_heads" },
-       { }
- };
- 
-@@ -580,68 +580,35 @@
-       return;
- }
- 
--static struct attribute_spec randomize_layout_attr = {
--      .name           = "randomize_layout",
--      // related to args
--      .min_length     = 0,
--      .max_length     = 0,
--      .decl_required  = false,
--      // need type declaration
--      .type_required  = true,
--      .function_type_required = false,
--      .handler                = handle_randomize_layout_attr,
--#if BUILDING_GCC_VERSION >= 4007
--      .affects_type_identity  = true
--#endif
--};
-+static struct attribute_spec randomize_layout_attr = { };
-+static struct attribute_spec no_randomize_layout_attr = { };
-+static struct attribute_spec randomize_considered_attr = { };
-+static struct attribute_spec randomize_performed_attr = { };
- 
--static struct attribute_spec no_randomize_layout_attr = {
--      .name           = "no_randomize_layout",
--      // related to args
--      .min_length     = 0,
--      .max_length     = 0,
--      .decl_required  = false,
--      // need type declaration
--      .type_required  = true,
--      .function_type_required = false,
--      .handler                = handle_randomize_layout_attr,
-+static void register_attributes(void *event_data, void *data)
-+{
-+      randomize_layout_attr.name              = "randomize_layout";
-+      randomize_layout_attr.type_required     = true;
-+      randomize_layout_attr.handler           = handle_randomize_layout_attr;
- #if BUILDING_GCC_VERSION >= 4007
--      .affects_type_identity  = true
-+      randomize_layout_attr.affects_type_identity = true;
- #endif
--};
- 
--static struct attribute_spec randomize_considered_attr = {
--      .name           = "randomize_considered",
--      // related to args
--      .min_length     = 0,
--      .max_length     = 0,
--      .decl_required  = false,
--      // need type declaration
--      .type_required  = true,
--      .function_type_required = false,
--      .handler                = handle_randomize_considered_attr,
-+      no_randomize_layout_attr.name           = "no_randomize_layout";
-+      no_randomize_layout_attr.type_required  = true;
-+      no_randomize_layout_attr.handler        = handle_randomize_layout_attr;
- #if BUILDING_GCC_VERSION >= 4007
--      .affects_type_identity  = false
-+      no_randomize_layout_attr.affects_type_identity = true;
- #endif
--};
- 
--static struct attribute_spec randomize_performed_attr = {
--      .name           = "randomize_performed",
--      // related to args
--      .min_length     = 0,
--      .max_length     = 0,
--      .decl_required  = false,
--      // need type declaration
--      .type_required  = true,
--      .function_type_required = false,
--      .handler                = handle_randomize_performed_attr,
--#if BUILDING_GCC_VERSION >= 4007
--      .affects_type_identity  = false
--#endif
--};
-+      randomize_considered_attr.name          = "randomize_considered";
-+      randomize_considered_attr.type_required = true;
-+      randomize_considered_attr.handler       = handle_randomize_considered_attr;
-+
-+      randomize_performed_attr.name           = "randomize_performed";
-+      randomize_performed_attr.type_required  = true;
-+      randomize_performed_attr.handler        = handle_randomize_performed_attr;
- 
--static void register_attributes(void *event_data, void *data)
--{
-       register_attribute(&randomize_layout_attr);
-       register_attribute(&no_randomize_layout_attr);
-       register_attribute(&randomize_considered_attr);
-diff -ur linux-4.14/scripts/gcc-plugins/structleak_plugin.c linux-4.17/scripts/gcc-plugins/structleak_plugin.c
---- linux-4.14/scripts/gcc-plugins/structleak_plugin.c 2017-11-12 19:46:13.000000000 +0100
-+++ linux-4.17/scripts/gcc-plugins/structleak_plugin.c 2018-06-03 23:15:21.000000000 +0200
-@@ -57,21 +57,16 @@
-       return NULL_TREE;
- }
- 
--static struct attribute_spec user_attr = {
--      .name                   = "user",
--      .min_length             = 0,
--      .max_length             = 0,
--      .decl_required          = false,
--      .type_required          = false,
--      .function_type_required = false,
--      .handler                = handle_user_attribute,
--#if BUILDING_GCC_VERSION >= 4007
--      .affects_type_identity  = true
--#endif
--};
-+static struct attribute_spec user_attr = { };
- 
- static void register_attributes(void *event_data, void *data)
- {
-+      user_attr.name                  = "user";
-+      user_attr.handler               = handle_user_attribute;
-+#if BUILDING_GCC_VERSION >= 4007
-+      user_attr.affects_type_identity = true;
-+#endif
-+
-       register_attribute(&user_attr);
- }
- 

diff --git a/kernel.spec b/kernel.spec
index 51366ce4f4a61dfaae994778857036fc6b741061..1669246da654df5160f3f9b9c91c96eaf6e677ac 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -70,7 +70,7 @@
 
 %define                rel             1
 %define                basever         4.14
-%define                postver         .67
+%define                postver         .69
 
 # define this to '-%{basever}' for longterm branch
 %define                versuffix       -%{basever}
@@ -122,7 +122,7 @@ Source0:    https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
 # Source0-md5: bacdb9ffdcd922aa069a5e1520160e24
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:  db557e7181b526fced00b3dc50ed44fa
+# Patch0-md5:  b9a16b61e985f1615f1f111de2331be0
 %endif
 Source1:       kernel.sysconfig