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

Commit 76fa5601 authored by Pavel Skripkin's avatar Pavel Skripkin Committed by Greg Kroah-Hartman
Browse files

net: bnx2x: fix variable dereferenced before check 



[ Upstream commit f8885ac89ce310570e5391fe0bf0ec9c7c9b4fdc ]

Smatch says:
	bnx2x_init_ops.h:640 bnx2x_ilt_client_mem_op()
	warn: variable dereferenced before check 'ilt' (see line 638)

Move ilt_cli variable initialization _after_ ilt validation, because
it's unsafe to deref the pointer before validation check.

Fixes: 523224a3 ("bnx2x, cnic, bnx2i: use new FW/HSI")
Signed-off-by: default avatarPavel Skripkin <paskripkin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 26efb10b

drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h

+3 −1
Original line number Diff line number Diff line
@@ -635,11 +635,13 @@ static int bnx2x_ilt_client_mem_op(struct bnx2x *bp, int cli_num, 
{

	int i, rc;

	struct bnx2x_ilt *ilt = BP_ILT(bp);

	struct ilt_client_info *ilt_cli = &ilt->clients[cli_num];

	struct ilt_client_info *ilt_cli;



	if (!ilt || !ilt->lines)

		return -1;



	ilt_cli = &ilt->clients[cli_num];



	if (ilt_cli->flags & (ILT_CLIENT_SKIP_INIT | ILT_CLIENT_SKIP_MEM))

		return 0;