Linux-i3c Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH] i3c: master: Use struct_size() helper
@ 2019-05-31 17:35 Gustavo A. R. Silva
  2019-06-01  8:19 ` Boris Brezillon
  0 siblings, 1 reply; 2+ messages in thread
From: Gustavo A. R. Silva @ 2019-05-31 17:35 UTC (permalink / raw)
  To: Boris Brezillon; +Cc: linux-i3c, linux-kernel, 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.

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
 drivers/i3c/master.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c
index b9d2b88928e1..923b04052038 100644
--- a/drivers/i3c/master.c
+++ b/drivers/i3c/master.c
@@ -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;
 
-- 
2.21.0


_______________________________________________
linux-i3c mailing list
linux-i3c@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-i3c

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] i3c: master: Use struct_size() helper
  2019-05-31 17:35 [PATCH] i3c: master: Use struct_size() helper Gustavo A. R. Silva
@ 2019-06-01  8:19 ` Boris Brezillon
  0 siblings, 0 replies; 2+ messages in thread
From: Boris Brezillon @ 2019-06-01  8:19 UTC (permalink / raw)
  To: Gustavo A. R. Silva; +Cc: linux-i3c, linux-kernel, Boris Brezillon

On Fri, 31 May 2019 12:35:32 -0500
"Gustavo A. R. Silva" <gustavo@embeddedor.com> wrote:

> 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.
> 
> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
> ---
>  drivers/i3c/master.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c
> index b9d2b88928e1..923b04052038 100644
> --- a/drivers/i3c/master.c
> +++ b/drivers/i3c/master.c
> @@ -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));


>  	if (!defslvs)
>  		return -ENOMEM;
>  


_______________________________________________
linux-i3c mailing list
linux-i3c@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-i3c

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-31 17:35 [PATCH] i3c: master: Use struct_size() helper Gustavo A. R. Silva
2019-06-01  8:19 ` Boris Brezillon

Linux-i3c Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-i3c/0 linux-i3c/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-i3c linux-i3c/ https://lore.kernel.org/linux-i3c \
		linux-i3c@lists.infradead.org linux-i3c@archiver.kernel.org
	public-inbox-index linux-i3c


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.infradead.lists.linux-i3c


AGPL code for this site: git clone https://public-inbox.org/ public-inbox