Commit 3d5ecada authored by Michael Chan's avatar Michael Chan Committed by Jakub Kicinski
Browse files

bnxt_en: Fix W=stringop-overflow warning in bnxt_dcb.c 

Fix the following warning:

drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c: In function ‘bnxt_hwrm_queue_cos2bw_cfg’:
cc1: error: writing 12 bytes into a region of size 1 [-Werror=stringop-overflow ]
In file included from drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c:19:
drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h:6045:17: note: destination object ‘unused_0’ of size 1
 6045 |         u8      unused_0;

Fix it by modifying struct hwrm_queue_cos2bw_cfg_input to use an array
of sub struct similar to the previous patch.  This will eliminate the
pointer arithmetc to calculate the destination pointer passed to
memcpy().

Link: https://lore.kernel.org/netdev/CACKFLinikvXmKcxr4kjWO9TPYxTd2cb5agT1j=w9Qyj5-24s5A@mail.gmail.com/


Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Reviewed-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/20230807145720.159645-3-michael.chan@broadcom.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ac1b8c97

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

+7 −4
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ static int bnxt_hwrm_queue_cos2bw_cfg(struct bnxt *bp, struct ieee_ets *ets, 
{

	struct hwrm_queue_cos2bw_cfg_input *req;

	struct bnxt_cos2bw_cfg cos2bw;

	void *data;

	int rc, i;



	rc = hwrm_req_init(bp, req, HWRM_QUEUE_COS2BW_CFG);
@@ -129,11 +128,15 @@ static int bnxt_hwrm_queue_cos2bw_cfg(struct bnxt *bp, struct ieee_ets *ets, 
				cpu_to_le32((ets->tc_tx_bw[i] * 100) |

					    BW_VALUE_UNIT_PERCENT1_100);

		}

		data = &req->unused_0 + qidx * (sizeof(cos2bw) - 4);

		memcpy(data, &cos2bw.cfg, sizeof(cos2bw) - 4);

		if (qidx == 0) {

			req->queue_id0 = cos2bw.queue_id;

			req->unused_0 = 0;

			req->queue_id0_min_bw = cos2bw.min_bw;

			req->queue_id0_max_bw = cos2bw.max_bw;

			req->queue_id0_tsa_assign = cos2bw.tsa;

			req->queue_id0_pri_lvl = cos2bw.pri_lvl;

			req->queue_id0_bw_weight = cos2bw.bw_weight;

		} else {

			memcpy(&req->cfg[i - 1], &cos2bw.cfg, sizeof(cos2bw.cfg));

		}

	}

	return hwrm_req_send(bp, req);

drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h

+42 −280

File changed.

Preview size limit exceeded, changes collapsed.