Skip to contentSkip to conversation

clk: hisilicon: clkdivider-hi6220: use kzalloc_flex

PATCH Superseded Rosen Penev 2 participants 3 messages Mar 27 – Mar 30 Common clk

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 clk: hisilicon: clkdivider-hi6220: use kzalloc_flex

Combine allocations using kzalloc_flex and a flexible array member.

---
 drivers/clk/hisilicon/clkdivider-hi6220.c | 24 ++++++++---------------
 1 file changed, 8 insertions(+), 16 deletions(-)
drivers/clk/hisilicon/clkdivider-hi6220.c +8 -16
index 1787ecefe601..14d72fd716c2 100644
@@ -35,8 +35,8 @@ struct hi6220_clk_divider {
 	u8		shift;
 	u8		width;
 	u32		mask;
-	const struct clk_div_table *table;
 	spinlock_t	*lock;
+	struct clk_div_table table[];
 };
 
 #define to_hi6220_clk_divider(_hw)	\
@@ -108,24 +108,19 @@ struct clk *hi6220_register_clkdiv(struct device *dev, const char *name,
 	u32 max_div, min_div;
 	int i;
 
-	/* allocate the divider */
-	div = kzalloc_obj(*div);
-	if (!div)
-		return ERR_PTR(-ENOMEM);
-
 	/* Init the divider table */
 	max_div = div_mask(width) + 1;
 	min_div = 1;
 
-	table = kzalloc_objs(*table, max_div + 1);
-	if (!table) {
-		kfree(div);
+	/* allocate the divider */
+	div = kzalloc_flex(*div, table, max_div + 1);
+	if (!div)
 		return ERR_PTR(-ENOMEM);
-	}
 
 	for (i = 0; i < max_div; i++) {
-		table[i].div = min_div + i;
-		table[i].val = table[i].div - 1;
+		table = &div->table[i];
+		table->div = min_div + i;
+		table->val = table[i].div - 1;
 	}
 
 	init.name = name;
@@ -141,14 +136,11 @@ struct clk *hi6220_register_clkdiv(struct device *dev, const char *name,
 	div->mask = mask_bit ? BIT(mask_bit) : 0;
 	div->lock = lock;
 	div->hw.init = &init;
-	div->table = table;
 
 	/* register the clock */
 	clk = clk_register(dev, &div->hw);
-	if (IS_ERR(clk)) {
-		kfree(table);
+	if (IS_ERR(clk))
 		kfree(div);
-	}
 
 	return clk;
 }
Signature · 1 line
2.53.0
#1 lore raw

Hi Rosen,

Quoted 39 lines · Rosen Penev

Combine allocations using kzalloc_flex and a flexible array member.

---
 drivers/clk/hisilicon/clkdivider-hi6220.c | 24 ++++++++---------------
 1 file changed, 8 insertions(+), 16 deletions(-)
drivers/clk/hisilicon/clkdivider-hi6220.c +3 -9
index 1787ecefe601..14d72fd716c2 100644
@@ -35,8 +35,8 @@ struct hi6220_clk_divider {
 	u8		shift;
 	u8		width;
 	u32		mask;
-	const struct clk_div_table *table;
 	spinlock_t	*lock;
+	struct clk_div_table table[];
 };
 
 #define to_hi6220_clk_divider(_hw)	\
@@ -108,24 +108,19 @@ struct clk *hi6220_register_clkdiv(struct device *dev, const char *name,
 	u32 max_div, min_div;
 	int i;
 
-	/* allocate the divider */
-	div = kzalloc_obj(*div);
-	if (!div)
-		return ERR_PTR(-ENOMEM);
-
 	/* Init the divider table */
 	max_div = div_mask(width) + 1;
 	min_div = 1;
 
-	table = kzalloc_objs(*table, max_div + 1);
-	if (!table) {
-		kfree(div);
+	/* allocate the divider */
+	div = kzalloc_flex(*div, table, max_div + 1);

drivers/clk/hisilicon/clkdivider-hi6220.c struct clk *hi6220_register_clkdiv(struct device *dev, const char *name, · line 123

Quoted 10 lines
drivers/clk/hisilicon/clkdivider-hi6220.c +4 -3
+	if (!div)
 		return ERR_PTR(-ENOMEM);
-	}
 
 	for (i = 0; i < max_div; i++) {
-		table[i].div = min_div + i;
-		table[i].val = table[i].div - 1;
+		table = &div->table[i];
+		table->div = min_div + i;
+		table->val = table[i].div - 1;
                             ^^^^^^^^^^^^^^^^^

Sashiko has a question:
https://sashiko.dev/#/patchset/20260326042317.122536-1-rosenp%40gmail.com

Does this code read out-of-bounds and write incorrect values to the table?

Because table is reassigned to point to &div->table[i], accessing table[i].div in the following line effectively evaluates to div->table[2 * i].div.

For any i > 0, this reads uninitialized memory from further down the array, and when 2 * i >= max_div + 1, it reads beyond the newly allocated flex array. Could we use table->val = table->div - 1 instead?

Brian

Quoted 22 lines
drivers/clk/hisilicon/clkdivider-hi6220.c +1 -4
 	}
 
 	init.name = name;
@@ -141,14 +136,11 @@ struct clk *hi6220_register_clkdiv(struct device *dev, const char *name,
 	div->mask = mask_bit ? BIT(mask_bit) : 0;
 	div->lock = lock;
 	div->hw.init = &init;
-	div->table = table;
 
 	/* register the clock */
 	clk = clk_register(dev, &div->hw);
-	if (IS_ERR(clk)) {
-		kfree(table);
+	if (IS_ERR(clk))
 		kfree(div);
-	}
 
 	return clk;
 }
Signature · 1 line
2.53.0
#2 lore raw
Quoted 57 lines · Brian Masney

Hi Rosen,

Quoted 39 lines · Rosen Penev

Combine allocations using kzalloc_flex and a flexible array member.

---
 drivers/clk/hisilicon/clkdivider-hi6220.c | 24 ++++++++---------------
 1 file changed, 8 insertions(+), 16 deletions(-)
drivers/clk/hisilicon/clkdivider-hi6220.c +3 -9
index 1787ecefe601..14d72fd716c2 100644
@@ -35,8 +35,8 @@ struct hi6220_clk_divider {
      u8              shift;
      u8              width;
      u32             mask;
-     const struct clk_div_table *table;
      spinlock_t      *lock;
+     struct clk_div_table table[];
 };
 
 #define to_hi6220_clk_divider(_hw)   \
@@ -108,24 +108,19 @@ struct clk *hi6220_register_clkdiv(struct device *dev, const char *name,
      u32 max_div, min_div;
      int i;
 
-     /* allocate the divider */
-     div = kzalloc_obj(*div);
-     if (!div)
-             return ERR_PTR(-ENOMEM);
-
      /* Init the divider table */
      max_div = div_mask(width) + 1;
      min_div = 1;
 
-     table = kzalloc_objs(*table, max_div + 1);
-     if (!table) {
-             kfree(div);
+     /* allocate the divider */
+     div = kzalloc_flex(*div, table, max_div + 1);

drivers/clk/hisilicon/clkdivider-hi6220.c struct clk *hi6220_register_clkdiv(struct device *dev, const char *name, · line 123

Quoted 10 lines
drivers/clk/hisilicon/clkdivider-hi6220.c +4 -3
+     if (!div)
              return ERR_PTR(-ENOMEM);
-     }
 
      for (i = 0; i < max_div; i++) {
-             table[i].div = min_div + i;
-             table[i].val = table[i].div - 1;
+             table = &div->table[i];
+             table->div = min_div + i;
+             table->val = table[i].div - 1;
                             ^^^^^^^^^^^^^^^^^

Sashiko has a question:
https://sashiko.dev/#/patchset/20260326042317.122536-1-rosenp%40gmail.com

Quoted 8 lines

Does this code read out-of-bounds and write incorrect values to the table?

Because table is reassigned to point to &div->table[i], accessing table[i].div in the following line effectively evaluates to div->table[2 * i].div.

For any i > 0, this reads uninitialized memory from further down the array, and when 2 * i >= max_div + 1, it reads beyond the newly allocated flex array. Could we use table->val = table->div - 1 instead?

yep. left that out accidentally.

Quoted 26 lines

Brian

Quoted 22 lines
drivers/clk/hisilicon/clkdivider-hi6220.c +1 -5
      }
 
      init.name = name;
@@ -141,14 +136,11 @@ struct clk *hi6220_register_clkdiv(struct device *dev, const char *name,
      div->mask = mask_bit ? BIT(mask_bit) : 0;
      div->lock = lock;
      div->hw.init = &init;
-     div->table = table;
 
      /* register the clock */
      clk = clk_register(dev, &div->hw);
-     if (IS_ERR(clk)) {
-             kfree(table);
+     if (IS_ERR(clk))
              kfree(div);
-     }
 
      return clk;
 }
--

2.53.0