diff mbox series

net/mvneta: check allocation in rx queue flush

Message ID 1607341035-9372-1-git-send-email-wangyunjian@huawei.com (mailing list archive)
State Accepted, archived
Delegated to: Jerin Jacob
Headers
Series net/mvneta: check allocation in rx queue flush |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-testing success Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/travis-robot success Travis build: passed

Commit Message

Yunjian Wang Dec. 7, 2020, 11:37 a.m. UTC 
  From: Yunjian Wang <wangyunjian@huawei.com>

The function rte_malloc() could return NULL, the return value
need to be checked.

Fixes: ce7ea764597e ("net/mvneta: support Rx/Tx")
Cc: stable@dpdk.org

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
---
 drivers/net/mvneta/mvneta_rxtx.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

Comments

Liron Himi Dec. 7, 2020, 12:37 p.m. UTC | #1 
Hi,

How about use 2 local arrays for descs & bufs instead of the malloc/free? 

Liron


-----Original Message-----
From: wangyunjian <wangyunjian@huawei.com> 
Sent: Monday, 7 December 2020 13:37
To: dev@dpdk.org
Cc: Liron Himi <lironh@marvell.com>; zr@semihalf.com; jerry.lilijun@huawei.com; xudingke@huawei.com; Yunjian Wang <wangyunjian@huawei.com>; stable@dpdk.org
Subject: [EXT] [dpdk-dev] [PATCH] net/mvneta: check allocation in rx queue flush

External Email

----------------------------------------------------------------------
From: Yunjian Wang <wangyunjian@huawei.com>

The function rte_malloc() could return NULL, the return value need to be checked.

Fixes: ce7ea764597e ("net/mvneta: support Rx/Tx")
Cc: stable@dpdk.org

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
---
 drivers/net/mvneta/mvneta_rxtx.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/net/mvneta/mvneta_rxtx.c b/drivers/net/mvneta/mvneta_rxtx.c
index 10b6f57584..dfa7ecc090 100644
--- a/drivers/net/mvneta/mvneta_rxtx.c
+++ b/drivers/net/mvneta/mvneta_rxtx.c
@@ -872,7 +872,17 @@ mvneta_rx_queue_flush(struct mvneta_rxq *rxq)
 	int ret, i;
 
 	descs = rte_malloc("rxdesc", MRVL_NETA_RXD_MAX * sizeof(*descs), 0);
+	if (descs == NULL) {
+		MVNETA_LOG(ERR, "Failed to allocate descs.");
+		return;
+	}
+
 	bufs = rte_malloc("buffs", MRVL_NETA_RXD_MAX * sizeof(*bufs), 0);
+	if (bufs == NULL) {
+		MVNETA_LOG(ERR, "Failed to allocate bufs.");
+		rte_free(descs);
+		return;
+	}
 
 	do {
 		num = MRVL_NETA_RXD_MAX;
--
2.23.0
Yunjian Wang Dec. 7, 2020, 1:07 p.m. UTC | #2 
> -----Original Message-----
> From: Liron Himi [mailto:lironh@marvell.com]
> Sent: Monday, December 7, 2020 8:38 PM
> To: wangyunjian <wangyunjian@huawei.com>; dev@dpdk.org
> Cc: zr@semihalf.com; Lilijun (Jerry) <jerry.lilijun@huawei.com>; xudingke
> <xudingke@huawei.com>; stable@dpdk.org; Liron Himi <lironh@marvell.com>
> Subject: RE: [EXT] [dpdk-dev] [PATCH] net/mvneta: check allocation in rx queue
> flush
> 
> Hi,
> 
> How about use 2 local arrays for descs & bufs instead of the malloc/free?

The definition of these 2 arrays is 2048. If it is a local array, is it too large?

> 
> Liron
> 
> 
> -----Original Message-----
> From: wangyunjian <wangyunjian@huawei.com>
> Sent: Monday, 7 December 2020 13:37
> To: dev@dpdk.org
> Cc: Liron Himi <lironh@marvell.com>; zr@semihalf.com;
> jerry.lilijun@huawei.com; xudingke@huawei.com; Yunjian Wang
> <wangyunjian@huawei.com>; stable@dpdk.org
> Subject: [EXT] [dpdk-dev] [PATCH] net/mvneta: check allocation in rx queue flush
> 
> External Email
> 
> ----------------------------------------------------------------------
> From: Yunjian Wang <wangyunjian@huawei.com>
> 
> The function rte_malloc() could return NULL, the return value need to be
> checked.
> 
> Fixes: ce7ea764597e ("net/mvneta: support Rx/Tx")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> ---
>  drivers/net/mvneta/mvneta_rxtx.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/drivers/net/mvneta/mvneta_rxtx.c
> b/drivers/net/mvneta/mvneta_rxtx.c
> index 10b6f57584..dfa7ecc090 100644
> --- a/drivers/net/mvneta/mvneta_rxtx.c
> +++ b/drivers/net/mvneta/mvneta_rxtx.c
> @@ -872,7 +872,17 @@ mvneta_rx_queue_flush(struct mvneta_rxq *rxq)
>  	int ret, i;
> 
>  	descs = rte_malloc("rxdesc", MRVL_NETA_RXD_MAX * sizeof(*descs), 0);
> +	if (descs == NULL) {
> +		MVNETA_LOG(ERR, "Failed to allocate descs.");
> +		return;
> +	}
> +
>  	bufs = rte_malloc("buffs", MRVL_NETA_RXD_MAX * sizeof(*bufs), 0);
> +	if (bufs == NULL) {
> +		MVNETA_LOG(ERR, "Failed to allocate bufs.");
> +		rte_free(descs);
> +		return;
> +	}
> 
>  	do {
>  		num = MRVL_NETA_RXD_MAX;
> --
> 2.23.0
Liron Himi Dec. 15, 2020, 10:29 p.m. UTC | #3 
-----Original Message-----
From: wangyunjian <wangyunjian@huawei.com> 
Sent: Monday, 7 December 2020 15:08
To: Liron Himi <lironh@marvell.com>; dev@dpdk.org
Cc: zr@semihalf.com; Lilijun (Jerry) <jerry.lilijun@huawei.com>; xudingke <xudingke@huawei.com>; stable@dpdk.org
Subject: RE: [EXT] [dpdk-dev] [PATCH] net/mvneta: check allocation in rx queue flush

> -----Original Message-----
> From: Liron Himi [mailto:lironh@marvell.com]
> Sent: Monday, December 7, 2020 8:38 PM
> To: wangyunjian <wangyunjian@huawei.com>; dev@dpdk.org
> Cc: zr@semihalf.com; Lilijun (Jerry) <jerry.lilijun@huawei.com>; 
> xudingke <xudingke@huawei.com>; stable@dpdk.org; Liron Himi 
> <lironh@marvell.com>
> Subject: RE: [EXT] [dpdk-dev] [PATCH] net/mvneta: check allocation in 
> rx queue flush
> 
> Hi,
> 
> How about use 2 local arrays for descs & bufs instead of the malloc/free?

The definition of these 2 arrays is 2048. If it is a local array, is it too large?
[L.H.] I'm not sure. Lets stay with your original patch. 

Acked-by: Liron Himi <lironh@marvell.com>

> 
> Liron
> 
> 
> -----Original Message-----
> From: wangyunjian <wangyunjian@huawei.com>
> Sent: Monday, 7 December 2020 13:37
> To: dev@dpdk.org
> Cc: Liron Himi <lironh@marvell.com>; zr@semihalf.com; 
> jerry.lilijun@huawei.com; xudingke@huawei.com; Yunjian Wang 
> <wangyunjian@huawei.com>; stable@dpdk.org
> Subject: [EXT] [dpdk-dev] [PATCH] net/mvneta: check allocation in rx 
> queue flush
> 
> External Email
> 
> ----------------------------------------------------------------------
> From: Yunjian Wang <wangyunjian@huawei.com>
> 
> The function rte_malloc() could return NULL, the return value need to 
> be checked.
> 
> Fixes: ce7ea764597e ("net/mvneta: support Rx/Tx")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> ---
>  drivers/net/mvneta/mvneta_rxtx.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/drivers/net/mvneta/mvneta_rxtx.c
> b/drivers/net/mvneta/mvneta_rxtx.c
> index 10b6f57584..dfa7ecc090 100644
> --- a/drivers/net/mvneta/mvneta_rxtx.c
> +++ b/drivers/net/mvneta/mvneta_rxtx.c
> @@ -872,7 +872,17 @@ mvneta_rx_queue_flush(struct mvneta_rxq *rxq)
>  	int ret, i;
> 
>  	descs = rte_malloc("rxdesc", MRVL_NETA_RXD_MAX * sizeof(*descs), 0);
> +	if (descs == NULL) {
> +		MVNETA_LOG(ERR, "Failed to allocate descs.");
> +		return;
> +	}
> +
>  	bufs = rte_malloc("buffs", MRVL_NETA_RXD_MAX * sizeof(*bufs), 0);
> +	if (bufs == NULL) {
> +		MVNETA_LOG(ERR, "Failed to allocate bufs.");
> +		rte_free(descs);
> +		return;
> +	}
> 
>  	do {
>  		num = MRVL_NETA_RXD_MAX;
> --
> 2.23.0
Jerin Jacob Jan. 12, 2021, 2:21 p.m. UTC | #4 
On Mon, Dec 7, 2020 at 5:07 PM wangyunjian <wangyunjian@huawei.com> wrote:
>
> From: Yunjian Wang <wangyunjian@huawei.com>
>
> The function rte_malloc() could return NULL, the return value
> need to be checked.
>
> Fixes: ce7ea764597e ("net/mvneta: support Rx/Tx")
> Cc: stable@dpdk.org
>
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>

Acked-by: Liron Himi <lironh@marvell.com>
Applied to dpdk-next-net-mrvl/for-main. Thanks



> ---
>  drivers/net/mvneta/mvneta_rxtx.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>
> diff --git a/drivers/net/mvneta/mvneta_rxtx.c b/drivers/net/mvneta/mvneta_rxtx.c
> index 10b6f57584..dfa7ecc090 100644
> --- a/drivers/net/mvneta/mvneta_rxtx.c
> +++ b/drivers/net/mvneta/mvneta_rxtx.c
> @@ -872,7 +872,17 @@ mvneta_rx_queue_flush(struct mvneta_rxq *rxq)
>         int ret, i;
>
>         descs = rte_malloc("rxdesc", MRVL_NETA_RXD_MAX * sizeof(*descs), 0);
> +       if (descs == NULL) {
> +               MVNETA_LOG(ERR, "Failed to allocate descs.");
> +               return;
> +       }
> +
>         bufs = rte_malloc("buffs", MRVL_NETA_RXD_MAX * sizeof(*bufs), 0);
> +       if (bufs == NULL) {
> +               MVNETA_LOG(ERR, "Failed to allocate bufs.");
> +               rte_free(descs);
> +               return;
> +       }
>
>         do {
>                 num = MRVL_NETA_RXD_MAX;
> --
> 2.23.0
>
diff mbox series

Patch

diff --git a/drivers/net/mvneta/mvneta_rxtx.c b/drivers/net/mvneta/mvneta_rxtx.c
index 10b6f57584..dfa7ecc090 100644
--- a/drivers/net/mvneta/mvneta_rxtx.c
+++ b/drivers/net/mvneta/mvneta_rxtx.c
@@ -872,7 +872,17 @@  mvneta_rx_queue_flush(struct mvneta_rxq *rxq)
 	int ret, i;
 
 	descs = rte_malloc("rxdesc", MRVL_NETA_RXD_MAX * sizeof(*descs), 0);
+	if (descs == NULL) {
+		MVNETA_LOG(ERR, "Failed to allocate descs.");
+		return;
+	}
+
 	bufs = rte_malloc("buffs", MRVL_NETA_RXD_MAX * sizeof(*bufs), 0);
+	if (bufs == NULL) {
+		MVNETA_LOG(ERR, "Failed to allocate bufs.");
+		rte_free(descs);
+		return;
+	}
 
 	do {
 		num = MRVL_NETA_RXD_MAX;