Commit 30532568 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Jon Mason
Browse files

NTB/msi: Use struct_size() helper in devm_kzalloc() 

Make use of the struct_size() helper instead of an open-coded version,
in order to avoid any potential type mistakes or integer overflows that,
in the worst scenario, could lead to heap overflows.

Also, address the following sparse warnings:
drivers/ntb/msi.c:46:23: warning: using sizeof on a flexible structure

Link: https://github.com/KSPP/linux/issues/174


Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
parent e783362e

drivers/ntb/msi.c

+2 −4
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ int ntb_msi_init(struct ntb_dev *ntb, 
{

	phys_addr_t mw_phys_addr;

	resource_size_t mw_size;

	size_t struct_size;

	int peer_widx;

	int peers;

	int ret;
@@ -43,9 +42,8 @@ int ntb_msi_init(struct ntb_dev *ntb, 
	if (peers <= 0)

		return -EINVAL;



	struct_size = sizeof(*ntb->msi) + sizeof(*ntb->msi->peer_mws) * peers;



	ntb->msi = devm_kzalloc(&ntb->dev, struct_size, GFP_KERNEL);

	ntb->msi = devm_kzalloc(&ntb->dev, struct_size(ntb->msi, peer_mws, peers),

				GFP_KERNEL);

	if (!ntb->msi)

		return -ENOMEM;