Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cde048c5 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Greg Kroah-Hartman
Browse files

IB/qib: Use struct_size() helper 



commit 829ca44ecf60e9b6f83d0161a6ef10c1304c5060 upstream.

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(*pkt) + sizeof(pkt->addr[0])*n

with:

struct_size(pkt, addr, n)

Also, notice that variable size is unnecessary, hence it is removed.

This code was detected with the help of Coccinelle.

Signed-off-by: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Cc: Mile Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 53ec9dab

drivers/infiniband/hw/qib/qib_user_sdma.c

+3 −2
Original line number Diff line number Diff line
@@ -908,10 +908,11 @@ static int qib_user_sdma_queue_pkts(const struct qib_devdata *dd, 
		}



		if (frag_size) {

			int pktsize, tidsmsize, n;

			int tidsmsize, n;

			size_t pktsize;



			n = npages*((2*PAGE_SIZE/frag_size)+1);

			pktsize = sizeof(*pkt) + sizeof(pkt->addr[0])*n;

			pktsize = struct_size(pkt, addr, n);



			/*

			 * Determine if this is tid-sdma or just sdma.