| 1234567891011121314151617181920212223242526272829 |
- From 7316a9e5720c2f4112a96b32c4ec78d94a44adcf Mon Sep 17 00:00:00 2001
- From: popcornmix <[email protected]>
- 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 <[email protected]>
- ---
- 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
- @@ -2280,9 +2280,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;
|
