From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ajit Khaparde Subject: [PATCH 2/8] net/bnxt: fix to avoid a segfault Date: Wed, 19 Jul 2017 23:48:20 -0500 Message-ID: <20170720044826.44103-4-ajit.khaparde@broadcom.com> References: <20170720044826.44103-1-ajit.khaparde@broadcom.com> Cc: Stephen Hurd To: dev@dpdk.org Return-path: Received: from rnd-relay.smtp.broadcom.com (lpdvrndsmtp01.broadcom.com [192.19.229.170]) by dpdk.org (Postfix) with ESMTP id 2645C58F6 for ; Thu, 20 Jul 2017 06:48:40 +0200 (CEST) In-Reply-To: <20170720044826.44103-1-ajit.khaparde@broadcom.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Fix use of local variable to avoid segfault. cnt was incorrectly tested and decremented in the loop that removes a VLAN from the table. Fixes: 36735a932ca7 ("support set VF QOS and MAC anti spoof") Signed-off-by: Stephen Hurd Signed-off-by: Ajit Khaparde --- drivers/net/bnxt/rte_pmd_bnxt.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/net/bnxt/rte_pmd_bnxt.c b/drivers/net/bnxt/rte_pmd_bnxt.c index 0a8fb1e..0d48873 100644 --- a/drivers/net/bnxt/rte_pmd_bnxt.c +++ b/drivers/net/bnxt/rte_pmd_bnxt.c @@ -500,6 +500,7 @@ int rte_pmd_bnxt_set_vf_vlan_filter(uint8_t port, uint16_t vlan, continue; } + /* cnt is one less than vlan_count */ cnt = bp->pf.vf_info[i].vlan_count++; /* * And finally, add to the @@ -511,19 +512,19 @@ int rte_pmd_bnxt_set_vf_vlan_filter(uint8_t port, uint16_t vlan, ve->vid = rte_cpu_to_be_16(vlan); } } else { - for (j = 0; cnt; j++) { + for (j = 0; j < cnt; j++) { if (rte_be_to_cpu_16( - bp->pf.vf_info[i].vlan_table[j].vid) != - vlan) + bp->pf.vf_info[i].vlan_table[j].vid) != + vlan) continue; memmove( - &bp->pf.vf_info[i].vlan_table[j], - &bp->pf.vf_info[i].vlan_table[j + 1], - getpagesize() - - ((j + 1) * + &bp->pf.vf_info[i].vlan_table[j], + &bp->pf.vf_info[i].vlan_table[j + 1], + getpagesize() - + ((j + 1) * sizeof(struct bnxt_vlan_table_entry))); j--; - cnt = bp->pf.vf_info[i].vlan_count--; + cnt = --bp->pf.vf_info[i].vlan_count; } } rte_pmd_bnxt_set_vf_vlan_anti_spoof(dev->data->port_id, -- 2.10.1 (Apple Git-78)