aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-5.15
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2022-10-04 12:04:37 +0200
committerRafał Miłecki <rafal@milecki.pl>2022-10-04 12:06:03 +0200
commita5265497a4f6da158e95d6a450cb2cb6dc085cab (patch)
treef4dbe5b49558e8458c1d01bb91f4a4469ce9f9bc /target/linux/generic/hack-5.15
parent45109f69a64c31aa64db05d5de37cd7f6a1aaaa2 (diff)
downloadupstream-a5265497a4f6da158e95d6a450cb2cb6dc085cab.tar.gz
upstream-a5265497a4f6da158e95d6a450cb2cb6dc085cab.tar.bz2
upstream-a5265497a4f6da158e95d6a450cb2cb6dc085cab.zip
kernel: fix possible mtd NULL pointer dereference
Fixes: 1a9ee367343ed ("kernel: backport mtd dynamic partition patch") Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/hack-5.15')
-rw-r--r--target/linux/generic/hack-5.15/402-mtd-blktrans-call-add-disks-after-mtd-device.patch2
-rw-r--r--target/linux/generic/hack-5.15/420-mtd-set-rootfs-to-be-root-dev.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/hack-5.15/402-mtd-blktrans-call-add-disks-after-mtd-device.patch b/target/linux/generic/hack-5.15/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
index 011f790fa7..eaba093376 100644
--- a/target/linux/generic/hack-5.15/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
+++ b/target/linux/generic/hack-5.15/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
@@ -77,7 +77,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
#include "mtdcore.h"
-@@ -1073,6 +1074,8 @@ int mtd_device_parse_register(struct mtd
+@@ -1075,6 +1076,8 @@ int mtd_device_parse_register(struct mtd
ret = mtd_otp_nvmem_add(mtd);
diff --git a/target/linux/generic/hack-5.15/420-mtd-set-rootfs-to-be-root-dev.patch b/target/linux/generic/hack-5.15/420-mtd-set-rootfs-to-be-root-dev.patch
index 90254c63bf..8bf8288bbd 100644
--- a/target/linux/generic/hack-5.15/420-mtd-set-rootfs-to-be-root-dev.patch
+++ b/target/linux/generic/hack-5.15/420-mtd-set-rootfs-to-be-root-dev.patch
@@ -20,7 +20,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
#include <linux/nvmem-provider.h>
#include <linux/mtd/mtd.h>
-@@ -768,6 +769,16 @@ int add_mtd_device(struct mtd_info *mtd)
+@@ -770,6 +771,16 @@ int add_mtd_device(struct mtd_info *mtd)
of this try_ nonsense, and no bitching about it
either. :) */
__module_get(THIS_MODULE);