[v1] examples/l3fwd: fix core dump after packet match

Message ID 20220907113354.1443744-1-sean.morrissey@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series [v1] examples/l3fwd: fix core dump after packet match |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/github-robot: build success github build: passed
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-aarch64-unit-testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS

Commit Message

Sean Morrissey Sept. 7, 2022, 11:33 a.m. UTC
  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

Vladimir Medvedkin Sept. 21, 2022, 6:14 p.m. UTC | #1
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 *)&eth_hdr->dst_addr = dest_eth_addr[hops[j]];
> -		rte_ether_addr_copy(&ports_eth_addr[hops[j]],
> -						&eth_hdr->src_addr);
> -	}
> -
> -	for (j  = 0; j != nb_tx; j++) {
> -		if (hops[j] != BAD_PORT)
> +		if (hops[j] != BAD_PORT) {
> +			*(uint64_t *)&eth_hdr->dst_addr = dest_eth_addr[hops[j]];
> +			rte_ether_addr_copy(&ports_eth_addr[hops[j]],
> +							&eth_hdr->src_addr);
>   			send_single_packet(qconf, pkts[j], hops[j]);
> -		else
> +		} else
>   			rte_pktmbuf_free(pkts[j]);
>   	}
>   }
  
Lingli Chen Oct. 8, 2022, 3:11 a.m. UTC | #2
> -----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>
  
Thomas Monjalon Oct. 10, 2022, 9:51 p.m. UTC | #3
> > 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.
  

Patch

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 *)&eth_hdr->dst_addr = dest_eth_addr[hops[j]];
-		rte_ether_addr_copy(&ports_eth_addr[hops[j]],
-						&eth_hdr->src_addr);
-	}
-
-	for (j  = 0; j != nb_tx; j++) {
-		if (hops[j] != BAD_PORT)
+		if (hops[j] != BAD_PORT) {
+			*(uint64_t *)&eth_hdr->dst_addr = dest_eth_addr[hops[j]];
+			rte_ether_addr_copy(&ports_eth_addr[hops[j]],
+							&eth_hdr->src_addr);
 			send_single_packet(qconf, pkts[j], hops[j]);
-		else
+		} else
 			rte_pktmbuf_free(pkts[j]);
 	}
 }