ethdev: add a check on mempool during rxq setup
Checks
Commit Message
We currently have no check on the mempool pointer passed to
rte_eth_rx_queue_setup.
Let's avoid a plain crash when dereferencing it.
Suggested-by: Jens Freimann <jfreimann@redhat.com>
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
lib/librte_ethdev/rte_ethdev.c | 5 +++++
lib/librte_ethdev/rte_ethdev.h | 6 +++---
2 files changed, 8 insertions(+), 3 deletions(-)
Comments
On Fri, May 17, 2019 at 10:15:08AM +0200, David Marchand wrote:
>We currently have no check on the mempool pointer passed to
>rte_eth_rx_queue_setup.
>Let's avoid a plain crash when dereferencing it.
>
>Suggested-by: Jens Freimann <jfreimann@redhat.com>
>Signed-off-by: David Marchand <david.marchand@redhat.com>
>---
> lib/librte_ethdev/rte_ethdev.c | 5 +++++
> lib/librte_ethdev/rte_ethdev.h | 6 +++---
> 2 files changed, 8 insertions(+), 3 deletions(-)
>
Thanks David!
Reviewed-by: Jens Freimann <jfreimann@redhat.com>
On 5/17/19 11:15 AM, David Marchand wrote:
> We currently have no check on the mempool pointer passed to
> rte_eth_rx_queue_setup.
> Let's avoid a plain crash when dereferencing it.
>
> Suggested-by: Jens Freimann <jfreimann@redhat.com>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Andrew Rybchenko <arybchenko@solarflare.com>
On 6/5/2019 5:46 PM, Andrew Rybchenko wrote:
> On 5/17/19 11:15 AM, David Marchand wrote:
>> We currently have no check on the mempool pointer passed to
>> rte_eth_rx_queue_setup.
>> Let's avoid a plain crash when dereferencing it.
>>
>> Suggested-by: Jens Freimann <jfreimann@redhat.com>
>> Signed-off-by: David Marchand <david.marchand@redhat.com>
>
> Acked-by: Andrew Rybchenko <arybchenko@solarflare.com>
>
Applied to dpdk-next-net/master, thanks.
@@ -1579,6 +1579,11 @@ struct rte_eth_dev *
return -EINVAL;
}
+ if (mp == NULL) {
+ RTE_ETHDEV_LOG(ERR, "Invalid null mempool pointer\n");
+ return -EINVAL;
+ }
+
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_infos_get, -ENOTSUP);
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_setup, -ENOTSUP);
@@ -1745,9 +1745,9 @@ int rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_queue,
* @return
* - 0: Success, receive queue correctly set up.
* - -EIO: if device is removed.
- * - -EINVAL: The size of network buffers which can be allocated from the
- * memory pool does not fit the various buffer sizes allowed by the
- * device controller.
+ * - -EINVAL: The memory pool pointer is null or the size of network buffers
+ * which can be allocated from this memory pool does not fit the various
+ * buffer sizes allowed by the device controller.
* - -ENOMEM: Unable to allocate the receive ring descriptors or to
* allocate network memory buffers from the memory pool when
* initializing receive descriptors.