kernel: update to 3.14.54

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/lfs/linux b/lfs/linux
index fe74ad1e1171bbcf8820b6eec2c11b397b0b3b20..85b4060d3f005fad499f7cf0d27df45606a9003a 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,10 +24,10 @@
 
 include Config
 
-VER         = 3.14.53
-RPI_PATCHES = 3.14.53-grsec-ipfire1
-A7M_PATCHES = 3.14.53-grsec-ipfire1
-GRS_PATCHES = grsecurity-3.1ipfire-3.14.53-v1.patch.xz
+VER         = 3.14.54
+RPI_PATCHES = 3.14.54-grsec-ipfire1
+A7M_PATCHES = 3.14.54-grsec-ipfire1
+GRS_PATCHES = grsecurity-3.1ipfire-3.14.54-v1.patch.xz
 
 
 THISAPP    = linux-$(VER)
@@ -83,10 +83,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz         = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).
 arm7-multi-patches-$(A7M_PATCHES).patch.xz     = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz
 $(GRS_PATCHES)                                 = $(URL_IPFIRE)/$(GRS_PATCHES)
 
-$(DL_FILE)_MD5                                 = 5c5d18ddcc80b008826c2f43b322a34a
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5                = de5350ee7c3e4aa82289916963796fd9
-arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = 25fc733bb657a84eea338104f88bcf70
-$(GRS_PATCHES)_MD5                             = 4c1f6e73f04bfc92b105afff24d0308c
+$(DL_FILE)_MD5                                 = 61a0568abd96bef9b682d0d46977fbdd
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5                = db92bc85979895efdc6d9da2877ce0ae
+arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = 9092711bcac325c5d0dac5eed98f1c5d
+$(GRS_PATCHES)_MD5                             = 0c1e505cf87177bfb7d62c95e67f10ef
 
 install : $(TARGET)
 
@@ -134,6 +134,9 @@ ifneq "$(KCFG)" "-headers"
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-compat_vdso.patch
 endif
 
+       # Fix ip route list hang introduced with linux 3.14.54
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.54_fix_ip_route_list.patch
+
        # DVB Patches
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-dvbsky.patch
        cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch

diff --git a/src/patches/linux-3.14.54_fix_ip_route_list.patch b/src/patches/linux-3.14.54_fix_ip_route_list.patch
new file mode 100644 (file)
index 0000000..6613d15
--- /dev/null
+++ b/src/patches/linux-3.14.54_fix_ip_route_list.patch
@@ -0,0 +1,12 @@
+diff -Naur a/net/core/fib_rules.c b/net/core/fib_rules.c
+--- a/net/core/fib_rules.c     2015-10-19 16:40:32.000000000 +0200
++++ b/net/core/fib_rules.c     2015-10-19 16:54:37.836777983 +0200
+@@ -631,7 +631,7 @@
+               err = fib_nl_fill_rule(skb, rule, NETLINK_CB(cb->skb).portid,
+                                      cb->nlh->nlmsg_seq, RTM_NEWRULE,
+                                      NLM_F_MULTI, ops);
+-              if (err)
++              if (err < 0)
+                       break;
+ skip:
+               idx++;