aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-4.19/207-disable-modorder.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-07-04 01:34:26 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2020-07-04 21:12:42 +0200
commit6062d858929df927e244280ec4864b35a217d6d1 (patch)
tree6ff4342b85f5b4953b16f9561176d2ea0f1b4fa2 /target/linux/generic/hack-4.19/207-disable-modorder.patch
parentce958dd88a7e74cd7aa7c345c97c79556bc2d926 (diff)
downloadupstream-6062d858929df927e244280ec4864b35a217d6d1.tar.gz
upstream-6062d858929df927e244280ec4864b35a217d6d1.tar.bz2
upstream-6062d858929df927e244280ec4864b35a217d6d1.zip
kernel: Update kernel 4.19 to version 4.19.131
Fixes: - CVE-2020-10757 The "mtd: rawnand: Pass a nand_chip object to nand_release()" commit was backported which needed some adaptations to other code. Run tested: ath79 Build tested: ath79 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/hack-4.19/207-disable-modorder.patch')
-rw-r--r--target/linux/generic/hack-4.19/207-disable-modorder.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/hack-4.19/207-disable-modorder.patch b/target/linux/generic/hack-4.19/207-disable-modorder.patch
index f47da3f24e..cf38cd3245 100644
--- a/target/linux/generic/hack-4.19/207-disable-modorder.patch
+++ b/target/linux/generic/hack-4.19/207-disable-modorder.patch
@@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/Makefile
+++ b/Makefile
-@@ -1232,7 +1232,6 @@ all: modules
+@@ -1240,7 +1240,6 @@ endif
PHONY += modules
modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
@@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
@$(kecho) ' Building modules, stage 2.';
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
-@@ -1261,7 +1260,6 @@ _modinst_:
+@@ -1269,7 +1268,6 @@ _modinst_:
rm -f $(MODLIB)/build ; \
ln -s $(CURDIR) $(MODLIB)/build ; \
fi