| Message ID | 20181028021640.38318-1-ferruh.yigit@intel.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Ferruh Yigit |
| Headers | show |
| Series | app/testpmd: fix possible uninitialized variable usage | expand |
| Context | Check | Description |
|---|---|---|
| ci/checkpatch | success | coding style OK |
| ci/Intel-compilation | success | Compilation OK |
> -----Original Message----- > From: Yigit, Ferruh > Sent: Sunday, October 28, 2018 2:17 AM > To: Lu, Wenzhuo <wenzhuo.lu@intel.com>; Wu, Jingjing > <jingjing.wu@intel.com>; Iremonger, Bernard <bernard.iremonger@intel.com> > Cc: dev@dpdk.org; Yigit, Ferruh <ferruh.yigit@intel.com>; stable@dpdk.org > Subject: [PATCH] app/testpmd: fix possible uninitialized variable usage > > ol_flags can be wrong if DEV_TX_OFFLOAD_VLAN_INSERT is not set in > tx_offloads > > Fixes: 3eecba267cd6 ("app/testpmd: cleanup internal Tx offloads flags field") > Cc: stable@dpdk.org > > Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com> Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
On 10/30/2018 10:59 AM, Iremonger, Bernard wrote: >> -----Original Message----- >> From: Yigit, Ferruh >> Sent: Sunday, October 28, 2018 2:17 AM >> To: Lu, Wenzhuo <wenzhuo.lu@intel.com>; Wu, Jingjing >> <jingjing.wu@intel.com>; Iremonger, Bernard <bernard.iremonger@intel.com> >> Cc: dev@dpdk.org; Yigit, Ferruh <ferruh.yigit@intel.com>; stable@dpdk.org >> Subject: [PATCH] app/testpmd: fix possible uninitialized variable usage >> >> ol_flags can be wrong if DEV_TX_OFFLOAD_VLAN_INSERT is not set in >> tx_offloads >> >> Fixes: 3eecba267cd6 ("app/testpmd: cleanup internal Tx offloads flags field") >> Cc: stable@dpdk.org >> >> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com> > > Acked-by: Bernard Iremonger <bernard.iremonger@intel.com> Applied to dpdk-next-net/master, thanks.
diff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c index 0531b5d27..3214e3c95 100644 --- a/app/test-pmd/flowgen.c +++ b/app/test-pmd/flowgen.c @@ -123,7 +123,7 @@ pkt_burst_flow_gen(struct fwd_stream *fs) struct ipv4_hdr *ip_hdr; struct udp_hdr *udp_hdr; uint16_t vlan_tci, vlan_tci_outer; - uint64_t ol_flags; + uint64_t ol_flags = 0; uint16_t nb_rx; uint16_t nb_tx; uint16_t nb_pkt; @@ -155,7 +155,7 @@ pkt_burst_flow_gen(struct fwd_stream *fs) tx_offloads = ports[fs->tx_port].dev_conf.txmode.offloads; if (tx_offloads & DEV_TX_OFFLOAD_VLAN_INSERT) - ol_flags = PKT_TX_VLAN_PKT; + ol_flags |= PKT_TX_VLAN_PKT; if (tx_offloads & DEV_TX_OFFLOAD_QINQ_INSERT) ol_flags |= PKT_TX_QINQ_PKT; if (tx_offloads & DEV_TX_OFFLOAD_MACSEC_INSERT)
ol_flags can be wrong if DEV_TX_OFFLOAD_VLAN_INSERT is not set in tx_offloads Fixes: 3eecba267cd6 ("app/testpmd: cleanup internal Tx offloads flags field") Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com> --- app/test-pmd/flowgen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)