d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/ice: check illegal packet sizes

Browse Source 
If the length of data_len in mbuf is less than 17 or
greater than the maximum frame size, it is illegal.

These illegal packets will lead to Tx/Rx hang and
can't recover automatically.

This patch check those illegal packets and protect
Tx/Rx from hanging.

Fixes: 17c7d0f9d6 ("net/ice: support basic Rx/Tx")
Cc: stable@dpdk.org

Signed-off-by: Kevin Liu <kevinx.liu@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
This commit is contained in:
Kevin Liu 2022-09-27 07:15:22 +00:00 committed by Qi Zhang
parent 19ee91c6bd
commit ccf33dccf7
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/ice/ice_rxtx.c
View File

@ -3442,6 +3442,9 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
int i, ret;
uint64_t ol_flags;
struct rte_mbuf *m;
struct ice_tx_queue *txq = tx_queue;
struct rte_eth_dev *dev = &rte_eth_devices[txq->port_id];
uint16_t max_frame_size = dev->data->mtu + ICE_ETH_OVERHEAD;
for (i = 0; i < nb_pkts; i++) {
m = tx_pkts[i];
@ -3458,6 +3461,14 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
return i;
}
/* check the data_len in mbuf */
if (m->data_len < ICE_TX_MIN_PKT_LEN ||
m->data_len > max_frame_size) {
rte_errno = EINVAL;
PMD_DRV_LOG(ERR, "INVALID mbuf: bad data_len=[%hu]", m->data_len);
return i;
}
#ifdef RTE_ETHDEV_DEBUG_TX
ret = rte_validate_tx_offload(m);
if (ret != 0) {

2
drivers/net/ice/ice_rxtx.h
View File

@ -40,6 +40,8 @@
#define ICE_RXDID_COMMS_OVS 22
#define ICE_TX_MIN_PKT_LEN 17
extern uint64_t ice_timestamp_dynflag;
extern int ice_timestamp_dynfield_offset;