[v1] examples/l3fwd: fix core dump after packet match
Checks
Commit Message
This patch fixes a core dump which occurs on 32-bit-builds
after sending a matched packet due to overrunning an array.
Fixes: 6de0ea50e9b9 ("examples/l3fwd: merge l3fwd-acl example")
Cc: sean.morrissey@intel.com
Cc: stable@dpdk.org
Signed-off-by: Sean Morrissey <sean.morrissey@intel.com>
---
examples/l3fwd/l3fwd_acl_scalar.h | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
Comments
Acked-by: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
On 07/09/2022 12:33, Sean Morrissey wrote:
> This patch fixes a core dump which occurs on 32-bit-builds
> after sending a matched packet due to overrunning an array.
>
> Fixes: 6de0ea50e9b9 ("examples/l3fwd: merge l3fwd-acl example")
> Cc: sean.morrissey@intel.com
> Cc: stable@dpdk.org
>
> Signed-off-by: Sean Morrissey <sean.morrissey@intel.com>
> ---
> examples/l3fwd/l3fwd_acl_scalar.h | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/examples/l3fwd/l3fwd_acl_scalar.h b/examples/l3fwd/l3fwd_acl_scalar.h
> index cd99f8594a..542c303d3b 100644
> --- a/examples/l3fwd/l3fwd_acl_scalar.h
> +++ b/examples/l3fwd/l3fwd_acl_scalar.h
> @@ -70,15 +70,12 @@ send_packets_single(struct lcore_conf *qconf, struct rte_mbuf *pkts[], uint16_t
>
> /* Set MAC addresses. */
> eth_hdr = rte_pktmbuf_mtod(pkts[j], struct rte_ether_hdr *);
> - *(uint64_t *)ð_hdr->dst_addr = dest_eth_addr[hops[j]];
> - rte_ether_addr_copy(&ports_eth_addr[hops[j]],
> - ð_hdr->src_addr);
> - }
> -
> - for (j = 0; j != nb_tx; j++) {
> - if (hops[j] != BAD_PORT)
> + if (hops[j] != BAD_PORT) {
> + *(uint64_t *)ð_hdr->dst_addr = dest_eth_addr[hops[j]];
> + rte_ether_addr_copy(&ports_eth_addr[hops[j]],
> + ð_hdr->src_addr);
> send_single_packet(qconf, pkts[j], hops[j]);
> - else
> + } else
> rte_pktmbuf_free(pkts[j]);
> }
> }
> -----Original Message-----
> From: Sean Morrissey <sean.morrissey@intel.com>
> Sent: Wednesday, September 7, 2022 7:34 PM
> To: Konstantin Ananyev <konstantin.ananyev@intel.com>; Morrissey, Sean
> <sean.morrissey@intel.com>
> Cc: dev@dpdk.org; stable@dpdk.org
> Subject: [PATCH v1] examples/l3fwd: fix core dump after packet match
>
> This patch fixes a core dump which occurs on 32-bit-builds after sending a
> matched packet due to overrunning an array.
>
> Fixes: 6de0ea50e9b9 ("examples/l3fwd: merge l3fwd-acl example")
> Cc: sean.morrissey@intel.com
> Cc: stable@dpdk.org
>
> Signed-off-by: Sean Morrissey <sean.morrissey@intel.com>
> ---
Tested-by: Lingli Chen <linglix.chen@intel.com>
> > This patch fixes a core dump which occurs on 32-bit-builds after sending a
> > matched packet due to overrunning an array.
> >
> > Fixes: 6de0ea50e9b9 ("examples/l3fwd: merge l3fwd-acl example")
> > Cc: sean.morrissey@intel.com
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Sean Morrissey <sean.morrissey@intel.com>
> Tested-by: Lingli Chen <linglix.chen@intel.com>
Applied, thanks.
@@ -70,15 +70,12 @@ send_packets_single(struct lcore_conf *qconf, struct rte_mbuf *pkts[], uint16_t
/* Set MAC addresses. */
eth_hdr = rte_pktmbuf_mtod(pkts[j], struct rte_ether_hdr *);
- *(uint64_t *)ð_hdr->dst_addr = dest_eth_addr[hops[j]];
- rte_ether_addr_copy(&ports_eth_addr[hops[j]],
- ð_hdr->src_addr);
- }
-
- for (j = 0; j != nb_tx; j++) {
- if (hops[j] != BAD_PORT)
+ if (hops[j] != BAD_PORT) {
+ *(uint64_t *)ð_hdr->dst_addr = dest_eth_addr[hops[j]];
+ rte_ether_addr_copy(&ports_eth_addr[hops[j]],
+ ð_hdr->src_addr);
send_single_packet(qconf, pkts[j], hops[j]);
- else
+ } else
rte_pktmbuf_free(pkts[j]);
}
}