Commit c05d042f authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by David S. Miller
Browse files

sparc64: viohs: 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. Also, remove unnecessary
variable _len_.

This code was detected with the help of Coccinelle and, audited and
fixed manually.

Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83


Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dd0d7181

arch/sparc/kernel/viohs.c

+2 −4
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ static int process_dreg_info(struct vio_driver_state *vio, 
			     struct vio_dring_register *pkt)

{

	struct vio_dring_state *dr;

	int i, len;

	int i;



	viodbg(HS, "GOT DRING_REG INFO ident[%llx] "

	       "ndesc[%u] dsz[%u] opt[0x%x] ncookies[%u]\n",
@@ -482,9 +482,7 @@ static int process_dreg_info(struct vio_driver_state *vio, 
	       pkt->num_descr, pkt->descr_size, pkt->options,

	       pkt->num_cookies);



	len = (sizeof(*pkt) +

	       (dr->ncookies * sizeof(struct ldc_trans_cookie)));

	if (send_ctrl(vio, &pkt->tag, len) < 0)

	if (send_ctrl(vio, &pkt->tag, struct_size(pkt, cookies, dr->ncookies)) < 0)

		goto send_nack;



	vio->dr_state |= VIO_DR_STATE_RXREG;