* [PATCH 2/4] net/null: fix packet copy [not found] <20250326213608.581345-1-stephen@networkplumber.org> @ 2025-03-26 21:35 ` Stephen Hemminger [not found] ` <20250401234828.10888-1-stephen@networkplumber.org> 1 sibling, 0 replies; 2+ messages in thread From: Stephen Hemminger @ 2025-03-26 21:35 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger, mukawa, stable, Tetsuya Mukawa, Bernard Iremonger If doing copy on transmit, can potentially copy past the data in the mbuf. Change to only copy data from that segment. Fixes: c743e50c475f ("null: new poll mode driver") Cc: mukawa@igel.co.jp Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- drivers/net/null/rte_eth_null.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c index 3a05af2e32..baae81c572 100644 --- a/drivers/net/null/rte_eth_null.c +++ b/drivers/net/null/rte_eth_null.c @@ -35,7 +35,7 @@ struct null_queue { struct pmd_internals *internals; struct rte_mempool *mb_pool; - struct rte_mbuf *dummy_packet; + void *dummy_packet; RTE_ATOMIC(uint64_t) rx_pkts; RTE_ATOMIC(uint64_t) tx_pkts; @@ -156,14 +156,14 @@ eth_null_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) static uint16_t eth_null_copy_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) { - int i; struct null_queue *h = q; - unsigned int packet_size; + unsigned int i; - packet_size = h->internals->packet_size; for (i = 0; i < nb_bufs; i++) { - rte_memcpy(h->dummy_packet, rte_pktmbuf_mtod(bufs[i], void *), - packet_size); + struct rte_mbuf *m = bufs[i]; + unsigned int len = RTE_MIN(h->internals->packet_size, m->data_len); + + rte_memcpy(h->dummy_packet, rte_pktmbuf_mtod(m, void *), len); rte_pktmbuf_free(bufs[i]); } -- 2.47.2 ^ permalink raw reply [flat|nested] 2+ messages in thread
[parent not found: <20250401234828.10888-1-stephen@networkplumber.org>]
* [PATCH v2 1/4] net/null: fix packet copy [not found] ` <20250401234828.10888-1-stephen@networkplumber.org> @ 2025-04-01 23:47 ` Stephen Hemminger 0 siblings, 0 replies; 2+ messages in thread From: Stephen Hemminger @ 2025-04-01 23:47 UTC (permalink / raw) To: dev; +Cc: Stephen Hemminger, mukawa, stable, Tetsuya Mukawa, Bernard Iremonger If doing copy on transmit, can potentially copy past the data in the mbuf. Change to only copy data from that segment. Fixes: c743e50c475f ("null: new poll mode driver") Cc: mukawa@igel.co.jp Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- drivers/net/null/rte_eth_null.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c index 6764cf2ec1..966748689f 100644 --- a/drivers/net/null/rte_eth_null.c +++ b/drivers/net/null/rte_eth_null.c @@ -35,7 +35,7 @@ struct null_queue { struct pmd_internals *internals; struct rte_mempool *mb_pool; - struct rte_mbuf *dummy_packet; + void *dummy_packet; RTE_ATOMIC(uint64_t) rx_pkts; RTE_ATOMIC(uint64_t) tx_pkts; @@ -163,17 +163,17 @@ eth_null_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) static uint16_t eth_null_copy_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) { - int i; struct null_queue *h = q; - unsigned int packet_size; + unsigned int i; if ((q == NULL) || (bufs == NULL)) return 0; - packet_size = h->internals->packet_size; for (i = 0; i < nb_bufs; i++) { - rte_memcpy(h->dummy_packet, rte_pktmbuf_mtod(bufs[i], void *), - packet_size); + struct rte_mbuf *m = bufs[i]; + size_t len = RTE_MIN(h->internals->packet_size, m->data_len); + + rte_memcpy(h->dummy_packet, rte_pktmbuf_mtod(m, void *), len); rte_pktmbuf_free(bufs[i]); } -- 2.47.2 ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-04-01 23:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20250326213608.581345-1-stephen@networkplumber.org>
2025-03-26 21:35 ` [PATCH 2/4] net/null: fix packet copy Stephen Hemminger
[not found] ` <20250401234828.10888-1-stephen@networkplumber.org>
2025-04-01 23:47 ` [PATCH v2 1/4] " Stephen Hemminger
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).