Skip to contentSkip to conversation

i3c: master: Use struct_size() helper

PATCH In review Gustavo A. R. Silva 2 participants 2 messages May 31, 2019 – Jun 1, 2019 I3C

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 i3c: master: Use struct_size() helper

Make use of the struct_size() helper instead of an open-coded version in order to avoid any potential type mistakes, in particular in the context in which this code is being used.

So, replace the following form:

sizeof(*defslvs) + ((ndevs - 1) * sizeof(struct i3c_ccc_dev_desc))

with:

struct_size(defslvs, slaves, ndevs - 1)

This code was detected with the help of Coccinelle.

---
 drivers/i3c/master.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/i3c/master.c +2 -3
index b9d2b88928e1..923b04052038 100644
@@ -924,9 +924,8 @@ int i3c_master_defslvs_locked(struct i3c_master_controller *master)
 		ndevs++;
 
 	defslvs = i3c_ccc_cmd_dest_init(&dest, I3C_BROADCAST_ADDR,
-					sizeof(*defslvs) +
-					((ndevs - 1) *
-					 sizeof(struct i3c_ccc_dev_desc)));
+					struct_size(defslvs, slaves,
+					ndevs - 1));
 	if (!defslvs)
 		return -ENOMEM;
 
Signature · 1 line
2.21.0
#1 lore raw
Quoted 24 lines · On Fri, 31 May 2019 12:35:32 -0500 "Gustavo A. R. Silva"…

Make use of the struct_size() helper instead of an open-coded version in order to avoid any potential type mistakes, in particular in the context in which this code is being used.

So, replace the following form:

sizeof(*defslvs) + ((ndevs - 1) * sizeof(struct i3c_ccc_dev_desc))

with:

struct_size(defslvs, slaves, ndevs - 1)

This code was detected with the help of Coccinelle.

---
 drivers/i3c/master.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/i3c/master.c +0 -0
index b9d2b88928e1..923b04052038 100644

drivers/i3c/master.c int i3c_master_defslvs_locked(struct i3c_master_controller *master) · line 928

Quoted 8 lines
drivers/i3c/master.c +2 -3
@@ -924,9 +924,8 @@ int i3c_master_defslvs_locked(struct i3c_master_controller *master)
 		ndevs++;
 
 	defslvs = i3c_ccc_cmd_dest_init(&dest, I3C_BROADCAST_ADDR,
-					sizeof(*defslvs) +
-					((ndevs - 1) *
-					 sizeof(struct i3c_ccc_dev_desc)));
+					struct_size(defslvs, slaves,
+					ndevs - 1));

ndev - 1 should be aligned on the struct_size open parens, or even better, be put on one line since it seems to fit the 80-chars limit:

defslvs = i3c_ccc_cmd_dest_init(&dest, I3C_BROADCAST_ADDR,

				struct_size(defslvs, slaves, ndevs - 1));
Quoted 3 lines
drivers/i3c/master.c +0 -0
 	if (!defslvs)
 		return -ENOMEM;