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

Commit ebd5818c authored by Vasundhara Volam's avatar Vasundhara Volam Committed by David S. Miller
Browse files

bnxt_en: Fix a variable scoping in bnxt_hwrm_do_send_msg() 



short_input variable is assigned to another data pointer which is
referred out of its scope. Fix it by moving short_input definition
to the beginning of bnxt_hwrm_do_send_msg() function.

No failure has been reported so far due to this issue.

Fixes: e605db80 ("bnxt_en: Support for Short Firmware Message")
Signed-off-by: default avatarVasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e9ecc731

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+1 −1
Original line number Diff line number Diff line
@@ -3368,6 +3368,7 @@ static int bnxt_hwrm_do_send_msg(struct bnxt *bp, void *msg, u32 msg_len, 
	u16 cp_ring_id, len = 0;

	struct hwrm_err_output *resp = bp->hwrm_cmd_resp_addr;

	u16 max_req_len = BNXT_HWRM_MAX_REQ_LEN;

	struct hwrm_short_input short_input = {0};



	req->seq_id = cpu_to_le16(bp->hwrm_cmd_seq++);

	memset(resp, 0, PAGE_SIZE);
@@ -3376,7 +3377,6 @@ static int bnxt_hwrm_do_send_msg(struct bnxt *bp, void *msg, u32 msg_len, 


	if (bp->flags & BNXT_FLAG_SHORT_CMD) {

		void *short_cmd_req = bp->hwrm_short_cmd_req_addr;

		struct hwrm_short_input short_input = {0};



		memcpy(short_cmd_req, req, msg_len);

		memset(short_cmd_req + msg_len, 0, BNXT_HWRM_MAX_REQ_LEN -