* [PATCH v3] net: mlx5: Add a missing check on idr_find, free buf
@ 2019-03-19 15:55 Aditya Pakki
2019-03-19 16:03 ` Eric Dumazet
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Aditya Pakki @ 2019-03-19 15:55 UTC (permalink / raw)
To: pakki001
Cc: kjlu, Boris Pismenny, Saeed Mahameed, Leon Romanovsky,
David S. Miller, Ilya Lesokhin, Wei Yongjun, netdev, linux-rdma,
linux-kernel
idr_find() can return a NULL value to 'flow' which is used without a check.
The patch adds a check to avoid potential NULL pointer dereference.
In case of mlx5_fpga_sbu_conn_sendmsg() failure, free buf allocated
using kzalloc.
---
v2: failure to return in case of flow failure.
v1: Failed to free buf in case of flow failure.
Signed-off-by: Aditya Pakki <pakki001@umn.edu>
---
drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c b/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c
index 5cf5f2a9d51f..224e0d7f6489 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c
@@ -226,6 +226,11 @@ int mlx5_fpga_tls_resync_rx(struct mlx5_core_dev *mdev, u32 handle, u32 seq,
rcu_read_lock();
flow = idr_find(&mdev->fpga->tls->rx_idr, ntohl(handle));
rcu_read_unlock();
+ if (!flow) {
+ WARN_ONCE(1, "Received NULL pointer for handle\n");
+ kfree(buf);
+ return -EINVAL;
+ }
mlx5_fpga_tls_flow_to_cmd(flow, cmd);
MLX5_SET(tls_cmd, cmd, swid, ntohl(handle));
@@ -238,6 +243,8 @@ int mlx5_fpga_tls_resync_rx(struct mlx5_core_dev *mdev, u32 handle, u32 seq,
buf->complete = mlx_tls_kfree_complete;
ret = mlx5_fpga_sbu_conn_sendmsg(mdev->fpga->tls->conn, buf);
+ if (ret < 0)
+ kfree(buf);
return ret;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v3] net: mlx5: Add a missing check on idr_find, free buf
2019-03-19 15:55 [PATCH v3] net: mlx5: Add a missing check on idr_find, free buf Aditya Pakki
@ 2019-03-19 16:03 ` Eric Dumazet
2019-03-19 16:03 ` Yuval Shaia
2019-03-19 16:57 ` Saeed Mahameed
2 siblings, 0 replies; 6+ messages in thread
From: Eric Dumazet @ 2019-03-19 16:03 UTC (permalink / raw)
To: Aditya Pakki
Cc: kjlu, Boris Pismenny, Saeed Mahameed, Leon Romanovsky,
David S. Miller, Ilya Lesokhin, Wei Yongjun, netdev, linux-rdma,
linux-kernel
On 03/19/2019 08:55 AM, Aditya Pakki wrote:
> idr_find() can return a NULL value to 'flow' which is used without a check.
> The patch adds a check to avoid potential NULL pointer dereference.
> In case of mlx5_fpga_sbu_conn_sendmsg() failure, free buf allocated
> using kzalloc.
>
> ---
> v2: failure to return in case of flow failure.
> v1: Failed to free buf in case of flow failure.
>
> Signed-off-by: Aditya Pakki <pakki001@umn.edu>
Please add an appropriate Fixes: tag, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3] net: mlx5: Add a missing check on idr_find, free buf
2019-03-19 15:55 [PATCH v3] net: mlx5: Add a missing check on idr_find, free buf Aditya Pakki
2019-03-19 16:03 ` Eric Dumazet
@ 2019-03-19 16:03 ` Yuval Shaia
2019-03-19 16:57 ` Saeed Mahameed
2 siblings, 0 replies; 6+ messages in thread
From: Yuval Shaia @ 2019-03-19 16:03 UTC (permalink / raw)
To: Aditya Pakki
Cc: kjlu, Boris Pismenny, Saeed Mahameed, Leon Romanovsky,
David S. Miller, Ilya Lesokhin, Wei Yongjun, netdev, linux-rdma,
linux-kernel
On Tue, Mar 19, 2019 at 10:55:20AM -0500, Aditya Pakki wrote:
> idr_find() can return a NULL value to 'flow' which is used without a check.
> The patch adds a check to avoid potential NULL pointer dereference.
> In case of mlx5_fpga_sbu_conn_sendmsg() failure, free buf allocated
> using kzalloc.
>
> ---
> v2: failure to return in case of flow failure.
> v1: Failed to free buf in case of flow failure.
>
> Signed-off-by: Aditya Pakki <pakki001@umn.edu>
> ---
> drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c b/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c
> index 5cf5f2a9d51f..224e0d7f6489 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c
> @@ -226,6 +226,11 @@ int mlx5_fpga_tls_resync_rx(struct mlx5_core_dev *mdev, u32 handle, u32 seq,
> rcu_read_lock();
> flow = idr_find(&mdev->fpga->tls->rx_idr, ntohl(handle));
> rcu_read_unlock();
> + if (!flow) {
> + WARN_ONCE(1, "Received NULL pointer for handle\n");
> + kfree(buf);
> + return -EINVAL;
> + }
> mlx5_fpga_tls_flow_to_cmd(flow, cmd);
>
> MLX5_SET(tls_cmd, cmd, swid, ntohl(handle));
> @@ -238,6 +243,8 @@ int mlx5_fpga_tls_resync_rx(struct mlx5_core_dev *mdev, u32 handle, u32 seq,
> buf->complete = mlx_tls_kfree_complete;
>
> ret = mlx5_fpga_sbu_conn_sendmsg(mdev->fpga->tls->conn, buf);
> + if (ret < 0)
> + kfree(buf);
>
> return ret;
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
> }
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v3] net: mlx5: Add a missing check on idr_find, free buf
2019-03-19 15:55 [PATCH v3] net: mlx5: Add a missing check on idr_find, free buf Aditya Pakki
2019-03-19 16:03 ` Eric Dumazet
2019-03-19 16:03 ` Yuval Shaia
@ 2019-03-19 16:57 ` Saeed Mahameed
2 siblings, 0 replies; 6+ messages in thread
From: Saeed Mahameed @ 2019-03-19 16:57 UTC (permalink / raw)
To: pakki001
Cc: linux-kernel, linux-rdma, Boris Pismenny, weiyongjun1, kjlu,
netdev, Ilya Lesokhin, davem, leon
On Tue, 2019-03-19 at 10:55 -0500, Aditya Pakki wrote:
> idr_find() can return a NULL value to 'flow' which is used without a
> check.
> The patch adds a check to avoid potential NULL pointer dereference.
> In case of mlx5_fpga_sbu_conn_sendmsg() failure, free buf allocated
> using kzalloc.
>
> ---
> v2: failure to return in case of flow failure.
> v1: Failed to free buf in case of flow failure.
>
> Signed-off-by: Aditya Pakki <pakki001@umn.edu>
> ---
> drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c
> b/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c
> index 5cf5f2a9d51f..224e0d7f6489 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c
> @@ -226,6 +226,11 @@ int mlx5_fpga_tls_resync_rx(struct mlx5_core_dev
> *mdev, u32 handle, u32 seq,
> rcu_read_lock();
> flow = idr_find(&mdev->fpga->tls->rx_idr, ntohl(handle));
> rcu_read_unlock();
> + if (!flow) {
> + WARN_ONCE(1, "Received NULL pointer for handle\n");
> + kfree(buf);
> + return -EINVAL;
> + }
Just a small nit, it would have been simpler if you just changed the
order between buf = kzalloc(...) and flow = idr_find, to avoid
kfree(buf) on err flow.
Please add the fixes tag as Eric suggested.
> mlx5_fpga_tls_flow_to_cmd(flow, cmd);
>
> MLX5_SET(tls_cmd, cmd, swid, ntohl(handle));
> @@ -238,6 +243,8 @@ int mlx5_fpga_tls_resync_rx(struct mlx5_core_dev
> *mdev, u32 handle, u32 seq,
> buf->complete = mlx_tls_kfree_complete;
>
> ret = mlx5_fpga_sbu_conn_sendmsg(mdev->fpga->tls->conn, buf);
> + if (ret < 0)
> + kfree(buf);
>
> return ret;
> }
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3] net: mlx5: Add a missing check on idr_find, free buf
@ 2019-03-19 16:24 Aditya Pakki
2019-03-19 16:25 ` Yuval Shaia
0 siblings, 1 reply; 6+ messages in thread
From: Aditya Pakki @ 2019-03-19 16:24 UTC (permalink / raw)
To: pakki001
Cc: kjlu, Boris Pismenny, Saeed Mahameed, Leon Romanovsky,
David S. Miller, Ilya Lesokhin, Wei Yongjun, netdev, linux-rdma,
linux-kernel
idr_find() can return a NULL value to 'flow' which is used without a check.
The patch adds a check to avoid potential NULL pointer dereference.
In case of mlx5_fpga_sbu_conn_sendmsg() failure, free buf allocated
using kzalloc.
---
Fixes: ab412e1dd7db ('net/mlx5: Accel, add TLS rx offload routines')
v2: failure to return in case of flow failure.
v1: Failed to free buf in case of flow failure.
Signed-off-by: Aditya Pakki <pakki001@umn.edu>
---
drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c b/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c
index 5cf5f2a9d51f..224e0d7f6489 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c
@@ -226,6 +226,11 @@ int mlx5_fpga_tls_resync_rx(struct mlx5_core_dev *mdev, u32 handle, u32 seq,
rcu_read_lock();
flow = idr_find(&mdev->fpga->tls->rx_idr, ntohl(handle));
rcu_read_unlock();
+ if (!flow) {
+ WARN_ONCE(1, "Received NULL pointer for handle\n");
+ kfree(buf);
+ return -EINVAL;
+ }
mlx5_fpga_tls_flow_to_cmd(flow, cmd);
MLX5_SET(tls_cmd, cmd, swid, ntohl(handle));
@@ -238,6 +243,8 @@ int mlx5_fpga_tls_resync_rx(struct mlx5_core_dev *mdev, u32 handle, u32 seq,
buf->complete = mlx_tls_kfree_complete;
ret = mlx5_fpga_sbu_conn_sendmsg(mdev->fpga->tls->conn, buf);
+ if (ret < 0)
+ kfree(buf);
return ret;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v3] net: mlx5: Add a missing check on idr_find, free buf
2019-03-19 16:24 Aditya Pakki
@ 2019-03-19 16:25 ` Yuval Shaia
0 siblings, 0 replies; 6+ messages in thread
From: Yuval Shaia @ 2019-03-19 16:25 UTC (permalink / raw)
To: Aditya Pakki
Cc: kjlu, Boris Pismenny, Saeed Mahameed, Leon Romanovsky,
David S. Miller, Ilya Lesokhin, Wei Yongjun, netdev, linux-rdma,
linux-kernel
On Tue, Mar 19, 2019 at 11:24:02AM -0500, Aditya Pakki wrote:
> idr_find() can return a NULL value to 'flow' which is used without a check.
> The patch adds a check to avoid potential NULL pointer dereference.
> In case of mlx5_fpga_sbu_conn_sendmsg() failure, free buf allocated
> using kzalloc.
>
> ---
> Fixes: ab412e1dd7db ('net/mlx5: Accel, add TLS rx offload routines')
This should be part of the commit message
> v2: failure to return in case of flow failure.
> v1: Failed to free buf in case of flow failure.
>
> Signed-off-by: Aditya Pakki <pakki001@umn.edu>
> ---
> drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c b/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c
> index 5cf5f2a9d51f..224e0d7f6489 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c
> @@ -226,6 +226,11 @@ int mlx5_fpga_tls_resync_rx(struct mlx5_core_dev *mdev, u32 handle, u32 seq,
> rcu_read_lock();
> flow = idr_find(&mdev->fpga->tls->rx_idr, ntohl(handle));
> rcu_read_unlock();
> + if (!flow) {
> + WARN_ONCE(1, "Received NULL pointer for handle\n");
> + kfree(buf);
> + return -EINVAL;
> + }
> mlx5_fpga_tls_flow_to_cmd(flow, cmd);
>
> MLX5_SET(tls_cmd, cmd, swid, ntohl(handle));
> @@ -238,6 +243,8 @@ int mlx5_fpga_tls_resync_rx(struct mlx5_core_dev *mdev, u32 handle, u32 seq,
> buf->complete = mlx_tls_kfree_complete;
>
> ret = mlx5_fpga_sbu_conn_sendmsg(mdev->fpga->tls->conn, buf);
> + if (ret < 0)
> + kfree(buf);
>
> return ret;
> }
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-03-19 16:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-19 15:55 [PATCH v3] net: mlx5: Add a missing check on idr_find, free buf Aditya Pakki
2019-03-19 16:03 ` Eric Dumazet
2019-03-19 16:03 ` Yuval Shaia
2019-03-19 16:57 ` Saeed Mahameed
2019-03-19 16:24 Aditya Pakki
2019-03-19 16:25 ` Yuval Shaia
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).