brcm2708: update to latest patches from RPi foundation
[openwrt/staging/chunkeey.git] / target / linux / brcm2708 / patches-4.19 / 950-0755-clk-bcm2835-Avoid-null-pointer-exception.patch
diff --git a/target/linux/brcm2708/patches-4.19/950-0755-clk-bcm2835-Avoid-null-pointer-exception.patch b/target/linux/brcm2708/patches-4.19/950-0755-clk-bcm2835-Avoid-null-pointer-exception.patch
new file mode 100644 (file)
index 0000000..a0939d7
--- /dev/null
@@ -0,0 +1,29 @@
+From 5b8a217fe818bc038592b8a5284ba0c18948fabf Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Tue, 6 Aug 2019 15:23:14 +0100
+Subject: [PATCH] clk-bcm2835: Avoid null pointer exception
+
+clk_desc_array[BCM2835_PLLB] doesn't exist so we dereference null when iterating
+
+Signed-off-by: popcornmix <popcornmix@gmail.com>
+---
+ drivers/clk/bcm/clk-bcm2835.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+--- a/drivers/clk/bcm/clk-bcm2835.c
++++ b/drivers/clk/bcm/clk-bcm2835.c
+@@ -2288,9 +2288,11 @@ static bool bcm2835_clk_is_claimed(const
+       int i;
+       for (i = 0; i < ARRAY_SIZE(clk_desc_array); i++) {
+-              const char *clk_name = *(const char **)(clk_desc_array[i].data);
+-              if (!strcmp(name, clk_name))
+-                  return bcm2835_clk_claimed[i];
++              if (clk_desc_array[i].data) {
++                      const char *clk_name = *(const char **)(clk_desc_array[i].data);
++                      if (!strcmp(name, clk_name))
++                              return bcm2835_clk_claimed[i];
++              }
+       }
+       return false;