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

Commit eb2a6b80 authored by Christophe Jaillet's avatar Christophe Jaillet Committed by David S. Miller
Browse files

qed: Fix a memory allocation failure test in 'qed_mcp_cmd_init()' 



We allocate 'p_info->mfw_mb_cur' and 'p_info->mfw_mb_shadow' but we check
'p_info->mfw_mb_addr' instead of 'p_info->mfw_mb_cur'.

'p_info->mfw_mb_addr' is never 0, because it is initiliazed a few lines
above in 'qed_load_mcp_offsets()'.

Update the test and check the result of the 2 'kzalloc()' instead.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: default avatarTomer Tayar <Tomer.Tayar@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b925ef37

drivers/net/ethernet/qlogic/qed/qed_mcp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -253,7 +253,7 @@ int qed_mcp_cmd_init(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) 
	size = MFW_DRV_MSG_MAX_DWORDS(p_info->mfw_mb_length) * sizeof(u32);

	size = MFW_DRV_MSG_MAX_DWORDS(p_info->mfw_mb_length) * sizeof(u32);

	p_info->mfw_mb_cur = kzalloc(size, GFP_KERNEL);

	p_info->mfw_mb_cur = kzalloc(size, GFP_KERNEL);

	p_info->mfw_mb_shadow = kzalloc(size, GFP_KERNEL);

	p_info->mfw_mb_shadow = kzalloc(size, GFP_KERNEL);

	if (!p_info->mfw_mb_shadow || !p_info->mfw_mb_addr)

	if (!p_info->mfw_mb_cur || !p_info->mfw_mb_shadow)

		goto err;

		goto err;





	return 0;

	return 0;