[dpdk-dev] [PATCH v2] net/i40e: fix max frame size checking

[Ananyev, Konstantin]

> -----Original Message-----
> From: Wu, Yanglong
> Sent: Friday, July 27, 2018 5:40 AM
> To: dev at dpdk.org
> Cc: Zhang, Qi Z <qi.z.zhang at intel.com>; Ananyev, Konstantin <konstantin.ananyev at intel.com>; Yao, Lei A <lei.a.yao at intel.com>;
> Wu, Yanglong <yanglong.wu at intel.com>
> Subject: [PATCH v2] net/i40e: fix max frame size checking
> 
> Check patcket size according to TSO or no-TSO.
> 
> Fixes: bfeed0262b0c ("net/i40e: check illegal packets")
> 
> Signed-off-by: Yanglong Wu <yanglong.wu at intel.com>
> ---
> v2:
> change as comments.
> ---
>  drivers/net/i40e/i40e_ethdev.h | 1 +
>  drivers/net/i40e/i40e_rxtx.c   | 9 +++++----
>  2 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h
> index cb5e5b5d8..3fffe5a55 100644
> --- a/drivers/net/i40e/i40e_ethdev.h
> +++ b/drivers/net/i40e/i40e_ethdev.h
> @@ -28,6 +28,7 @@
>  #define I40E_NUM_DESC_ALIGN       32
>  #define I40E_BUF_SIZE_MIN         1024
>  #define I40E_FRAME_SIZE_MAX       9728
> +#define I40E_TSO_FRAME_SIZE_MAX   262144
>  #define I40E_QUEUE_BASE_ADDR_UNIT 128
>  /* number of VSIs and queue default setting */
>  #define I40E_MAX_QP_NUM_PER_VF    16
> diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
> index 3be87fe6a..1bbc0340b 100644
> --- a/drivers/net/i40e/i40e_rxtx.c
> +++ b/drivers/net/i40e/i40e_rxtx.c
> @@ -1439,13 +1439,15 @@ i40e_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
> 
>  		/* Check for m->nb_segs to not exceed the limits. */
>  		if (!(ol_flags & PKT_TX_TCP_SEG)) {
> -			if (m->nb_segs > I40E_TX_MAX_MTU_SEG) {
> +			if (m->nb_segs > I40E_TX_MAX_MTU_SEG ||
> +			    m->pkt_len > I40E_FRAME_SIZE_MAX) {
>  				rte_errno = -EINVAL;
>  				return i;
>  			}
>  		} else if (m->nb_segs > I40E_TX_MAX_SEG ||
>  			   m->tso_segsz < I40E_MIN_TSO_MSS ||
> -			   m->tso_segsz > I40E_MAX_TSO_MSS) {
> +			   m->tso_segsz > I40E_MAX_TSO_MSS ||
> +			   m->pkt_len > I40E_TSO_FRAME_SIZE_MAX) {
>  			/* MSS outside the range (256B - 9674B) are considered
>  			 * malicious
>  			 */
> @@ -1459,8 +1461,7 @@ i40e_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
>  		}
> 
>  		/* check the size of packet */
> -		if (m->pkt_len > I40E_FRAME_SIZE_MAX ||
> -		    m->pkt_len < I40E_TX_MIN_PKT_LEN) {
> +		if (m->pkt_len < I40E_TX_MIN_PKT_LEN) {
>  			rte_errno = -EINVAL;
>  			return i;
>  		}
> --

Acked-by: Konstantin Ananyev <konstantin.ananyev at intel.com>

> 2.11.0