[dpdk-stable] net/i40e: fix integer overflow

[dpdk-stable] net/i40e: fix integer overflow

[Xiao Zhang]

When configuring i40e rx queue, the temporary variable to store max packet
length is not big enough which leads to integer overflow issue. This
patch is to fix the issue by changing the variable type from uint16_t
to uint32_t.

Fixes: c511a96a34d7 ("mbuf: add accessors for data room and private
size")
Cc: stable@dpdk.org

Signed-off-by: Xiao Zhang <xiao.zhang@intel.com>
---
 drivers/net/i40e/i40e_rxtx.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index bfe161f..ca15b12 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -2596,7 +2596,8 @@ i40e_rx_queue_config(struct i40e_rx_queue *rxq)
 	struct i40e_pf *pf = I40E_VSI_TO_PF(rxq->vsi);
 	struct i40e_hw *hw = I40E_VSI_TO_HW(rxq->vsi);
 	struct rte_eth_dev_data *data = pf->dev_data;
-	uint16_t buf_size, len;
+	uint16_t buf_size;
+	uint32_t len;
 
 	buf_size = (uint16_t)(rte_pktmbuf_data_room_size(rxq->mp) -
 		RTE_PKTMBUF_HEADROOM);
-- 
2.7.4

Re: [dpdk-stable] [dpdk-dev] net/i40e: fix integer overflow

[Kevin Traynor]

On 14/10/2019 09:33, Xiao Zhang wrote:
> When configuring i40e rx queue, the temporary variable to store max packet
> length is not big enough which leads to integer overflow issue. This
> patch is to fix the issue by changing the variable type from uint16_t
> to uint32_t.
> 
> Fixes: c511a96a34d7 ("mbuf: add accessors for data room and private
> size")

It should be
Fixes: 4861cde46116 ("i40e: new poll mode driver")

> Cc: stable@dpdk.org
> 
> Signed-off-by: Xiao Zhang <xiao.zhang@intel.com>
> ---
>  drivers/net/i40e/i40e_rxtx.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
> index bfe161f..ca15b12 100644
> --- a/drivers/net/i40e/i40e_rxtx.c
> +++ b/drivers/net/i40e/i40e_rxtx.c
> @@ -2596,7 +2596,8 @@ i40e_rx_queue_config(struct i40e_rx_queue *rxq)
>  	struct i40e_pf *pf = I40E_VSI_TO_PF(rxq->vsi);
>  	struct i40e_hw *hw = I40E_VSI_TO_HW(rxq->vsi);
>  	struct rte_eth_dev_data *data = pf->dev_data;
> -	uint16_t buf_size, len;
> +	uint16_t buf_size;
> +	uint32_t len;
>  

You can just remove the variable, it's only used once.

>  	buf_size = (uint16_t)(rte_pktmbuf_data_room_size(rxq->mp) -
>  		RTE_PKTMBUF_HEADROOM);
> 

Re: [dpdk-stable] [dpdk-dev] net/i40e: fix integer overflow

[Zhang, Xiao]

Hi Kevin,

Will update the patch according to your comments. Thanks.

Xiao

> -----Original Message-----
> From: Kevin Traynor [mailto:ktraynor@redhat.com]
> Sent: Monday, October 14, 2019 6:36 PM
> To: Zhang, Xiao <xiao.zhang@intel.com>; dev@dpdk.org
> Cc: Xing, Beilei <beilei.xing@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>;
> stable@dpdk.org
> Subject: Re: [dpdk-dev] net/i40e: fix integer overflow
> 
> On 14/10/2019 09:33, Xiao Zhang wrote:
> > When configuring i40e rx queue, the temporary variable to store max
> > packet length is not big enough which leads to integer overflow issue.
> > This patch is to fix the issue by changing the variable type from
> > uint16_t to uint32_t.
> >
> > Fixes: c511a96a34d7 ("mbuf: add accessors for data room and private
> > size")
> 
> It should be
> Fixes: 4861cde46116 ("i40e: new poll mode driver")
> 
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Xiao Zhang <xiao.zhang@intel.com>
> > ---
> >  drivers/net/i40e/i40e_rxtx.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/i40e/i40e_rxtx.c
> > b/drivers/net/i40e/i40e_rxtx.c index bfe161f..ca15b12 100644
> > --- a/drivers/net/i40e/i40e_rxtx.c
> > +++ b/drivers/net/i40e/i40e_rxtx.c
> > @@ -2596,7 +2596,8 @@ i40e_rx_queue_config(struct i40e_rx_queue *rxq)
> >  	struct i40e_pf *pf = I40E_VSI_TO_PF(rxq->vsi);
> >  	struct i40e_hw *hw = I40E_VSI_TO_HW(rxq->vsi);
> >  	struct rte_eth_dev_data *data = pf->dev_data;
> > -	uint16_t buf_size, len;
> > +	uint16_t buf_size;
> > +	uint32_t len;
> >
> 
> You can just remove the variable, it's only used once.
> 
> >  	buf_size = (uint16_t)(rte_pktmbuf_data_room_size(rxq->mp) -
> >  		RTE_PKTMBUF_HEADROOM);
> >

[dpdk-stable] [v2] net/i40e: fix integer overflow

[Xiao Zhang]

When config i40e rx queue, the temporary variable to store max packet
length is not big enough which leads to integer overflow issue. This
patch is to fix the issue by removing the variable and using the
expression directly since the variable only used once.

Fixes: 4861cde46116 ("i40e: new poll mode driver")
Cc: stable@dpdk.org

Signed-off-by: Xiao Zhang <xiao.zhang@intel.com>
---
v2
Correct the fixline and remove temporary variable.
---
 drivers/net/i40e/i40e_rxtx.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index bfe161f..ff6eb4a 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -2596,7 +2596,7 @@ i40e_rx_queue_config(struct i40e_rx_queue *rxq)
 	struct i40e_pf *pf = I40E_VSI_TO_PF(rxq->vsi);
 	struct i40e_hw *hw = I40E_VSI_TO_HW(rxq->vsi);
 	struct rte_eth_dev_data *data = pf->dev_data;
-	uint16_t buf_size, len;
+	uint16_t buf_size;
 
 	buf_size = (uint16_t)(rte_pktmbuf_data_room_size(rxq->mp) -
 		RTE_PKTMBUF_HEADROOM);
@@ -2619,8 +2619,9 @@ i40e_rx_queue_config(struct i40e_rx_queue *rxq)
 		break;
 	}
 
-	len = hw->func_caps.rx_buf_chain_len * rxq->rx_buf_len;
-	rxq->max_pkt_len = RTE_MIN(len, data->dev_conf.rxmode.max_rx_pkt_len);
+	rxq->max_pkt_len =
+		RTE_MIN((uint32_t)(hw->func_caps.rx_buf_chain_len *
+			rxq->rx_buf_len), data->dev_conf.rxmode.max_rx_pkt_len);
 	if (data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) {
 		if (rxq->max_pkt_len <= RTE_ETHER_MAX_LEN ||
 			rxq->max_pkt_len > I40E_FRAME_SIZE_MAX) {
-- 
2.7.4

Re: [dpdk-stable] [dpdk-dev] [v2] net/i40e: fix integer overflow

[Ye Xiaolong]

On 10/15, Xiao Zhang wrote:
>When config i40e rx queue, the temporary variable to store max packet
>length is not big enough which leads to integer overflow issue. This
>patch is to fix the issue by removing the variable and using the
>expression directly since the variable only used once.
>
>Fixes: 4861cde46116 ("i40e: new poll mode driver")
>Cc: stable@dpdk.org
>
>Signed-off-by: Xiao Zhang <xiao.zhang@intel.com>
>---
>v2
>Correct the fixline and remove temporary variable.
>---
> drivers/net/i40e/i40e_rxtx.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
>index bfe161f..ff6eb4a 100644
>--- a/drivers/net/i40e/i40e_rxtx.c
>+++ b/drivers/net/i40e/i40e_rxtx.c
>@@ -2596,7 +2596,7 @@ i40e_rx_queue_config(struct i40e_rx_queue *rxq)
> 	struct i40e_pf *pf = I40E_VSI_TO_PF(rxq->vsi);
> 	struct i40e_hw *hw = I40E_VSI_TO_HW(rxq->vsi);
> 	struct rte_eth_dev_data *data = pf->dev_data;
>-	uint16_t buf_size, len;
>+	uint16_t buf_size;
> 
> 	buf_size = (uint16_t)(rte_pktmbuf_data_room_size(rxq->mp) -
> 		RTE_PKTMBUF_HEADROOM);
>@@ -2619,8 +2619,9 @@ i40e_rx_queue_config(struct i40e_rx_queue *rxq)
> 		break;
> 	}
> 
>-	len = hw->func_caps.rx_buf_chain_len * rxq->rx_buf_len;
>-	rxq->max_pkt_len = RTE_MIN(len, data->dev_conf.rxmode.max_rx_pkt_len);
>+	rxq->max_pkt_len =
>+		RTE_MIN((uint32_t)(hw->func_caps.rx_buf_chain_len *
>+			rxq->rx_buf_len), data->dev_conf.rxmode.max_rx_pkt_len);
> 	if (data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) {
> 		if (rxq->max_pkt_len <= RTE_ETHER_MAX_LEN ||
> 			rxq->max_pkt_len > I40E_FRAME_SIZE_MAX) {
>-- 
>2.7.4
>

Acked-by: Xiaolong Ye <xiaolong.ye@intel.com>

Applied to dpdk-next-net-intel.