* [PATCH net-next] ibmvnic: Potential NULL dereference in clean_one_tx_pool()
@ 2018-03-23 11:36 ` Dan Carpenter
0 siblings, 0 replies; 8+ messages in thread
From: Dan Carpenter @ 2018-03-23 11:36 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Thomas Falcon
Cc: netdev, kernel-janitors, John Allen, Paul Mackerras, linuxppc-dev
There is an && vs || typo here, which potentially leads to a NULL
dereference.
Fixes: e9e1e97884b7 ("ibmvnic: Update TX pool cleaning routine")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 5632c030811b..0389a7a52152 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1135,7 +1135,7 @@ static void clean_one_tx_pool(struct ibmvnic_adapter *adapter,
u64 tx_entries;
int i;
- if (!tx_pool && !tx_pool->tx_buff)
+ if (!tx_pool || !tx_pool->tx_buff)
return;
tx_entries = tx_pool->num_buffers;
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH net-next] ibmvnic: Potential NULL dereference in clean_one_tx_pool()
@ 2018-03-23 11:36 ` Dan Carpenter
0 siblings, 0 replies; 8+ messages in thread
From: Dan Carpenter @ 2018-03-23 11:36 UTC (permalink / raw)
To: Benjamin Herrenschmidt, Thomas Falcon
Cc: John Allen, Benjamin Herrenschmidt, Paul Mackerras,
Michael Ellerman, netdev, linuxppc-dev, kernel-janitors
There is an && vs || typo here, which potentially leads to a NULL
dereference.
Fixes: e9e1e97884b7 ("ibmvnic: Update TX pool cleaning routine")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 5632c030811b..0389a7a52152 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1135,7 +1135,7 @@ static void clean_one_tx_pool(struct ibmvnic_adapter *adapter,
u64 tx_entries;
int i;
- if (!tx_pool && !tx_pool->tx_buff)
+ if (!tx_pool || !tx_pool->tx_buff)
return;
tx_entries = tx_pool->num_buffers;
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH net-next] ibmvnic: Potential NULL dereference in clean_one_tx_pool()
2018-03-23 11:36 ` Dan Carpenter
(?)
@ 2018-03-23 15:06 ` Thomas Falcon
-1 siblings, 0 replies; 8+ messages in thread
From: Thomas Falcon @ 2018-03-23 15:06 UTC (permalink / raw)
To: Dan Carpenter, Benjamin Herrenschmidt
Cc: John Allen, Paul Mackerras, Michael Ellerman, netdev,
linuxppc-dev, kernel-janitors
On 03/23/2018 06:36 AM, Dan Carpenter wrote:
> There is an && vs || typo here, which potentially leads to a NULL
> dereference.
Thanks for catching that!
>
> Fixes: e9e1e97884b7 ("ibmvnic: Update TX pool cleaning routine")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
> index 5632c030811b..0389a7a52152 100644
> --- a/drivers/net/ethernet/ibm/ibmvnic.c
> +++ b/drivers/net/ethernet/ibm/ibmvnic.c
> @@ -1135,7 +1135,7 @@ static void clean_one_tx_pool(struct ibmvnic_adapter *adapter,
> u64 tx_entries;
> int i;
>
> - if (!tx_pool && !tx_pool->tx_buff)
> + if (!tx_pool || !tx_pool->tx_buff)
> return;
>
> tx_entries = tx_pool->num_buffers;
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH net-next] ibmvnic: Potential NULL dereference in clean_one_tx_pool()
@ 2018-03-23 15:06 ` Thomas Falcon
0 siblings, 0 replies; 8+ messages in thread
From: Thomas Falcon @ 2018-03-23 15:06 UTC (permalink / raw)
To: Dan Carpenter, Benjamin Herrenschmidt
Cc: netdev, kernel-janitors, John Allen, Paul Mackerras, linuxppc-dev
On 03/23/2018 06:36 AM, Dan Carpenter wrote:
> There is an && vs || typo here, which potentially leads to a NULL
> dereference.
Thanks for catching that!
>
> Fixes: e9e1e97884b7 ("ibmvnic: Update TX pool cleaning routine")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
> index 5632c030811b..0389a7a52152 100644
> --- a/drivers/net/ethernet/ibm/ibmvnic.c
> +++ b/drivers/net/ethernet/ibm/ibmvnic.c
> @@ -1135,7 +1135,7 @@ static void clean_one_tx_pool(struct ibmvnic_adapter *adapter,
> u64 tx_entries;
> int i;
>
> - if (!tx_pool && !tx_pool->tx_buff)
> + if (!tx_pool || !tx_pool->tx_buff)
> return;
>
> tx_entries = tx_pool->num_buffers;
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH net-next] ibmvnic: Potential NULL dereference in clean_one_tx_pool()
@ 2018-03-23 15:06 ` Thomas Falcon
0 siblings, 0 replies; 8+ messages in thread
From: Thomas Falcon @ 2018-03-23 15:06 UTC (permalink / raw)
To: Dan Carpenter, Benjamin Herrenschmidt
Cc: John Allen, Paul Mackerras, Michael Ellerman, netdev,
linuxppc-dev, kernel-janitors
On 03/23/2018 06:36 AM, Dan Carpenter wrote:
> There is an && vs || typo here, which potentially leads to a NULL
> dereference.
Thanks for catching that!
>
> Fixes: e9e1e97884b7 ("ibmvnic: Update TX pool cleaning routine")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
> index 5632c030811b..0389a7a52152 100644
> --- a/drivers/net/ethernet/ibm/ibmvnic.c
> +++ b/drivers/net/ethernet/ibm/ibmvnic.c
> @@ -1135,7 +1135,7 @@ static void clean_one_tx_pool(struct ibmvnic_adapter *adapter,
> u64 tx_entries;
> int i;
>
> - if (!tx_pool && !tx_pool->tx_buff)
> + if (!tx_pool || !tx_pool->tx_buff)
> return;
>
> tx_entries = tx_pool->num_buffers;
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH net-next] ibmvnic: Potential NULL dereference in clean_one_tx_pool()
2018-03-23 11:36 ` Dan Carpenter
@ 2018-03-26 1:14 ` David Miller
-1 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2018-03-26 1:14 UTC (permalink / raw)
To: dan.carpenter
Cc: benh, tlfalcon, jallen, paulus, mpe, netdev, linuxppc-dev,
kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 23 Mar 2018 14:36:15 +0300
> There is an && vs || typo here, which potentially leads to a NULL
> dereference.
>
> Fixes: e9e1e97884b7 ("ibmvnic: Update TX pool cleaning routine")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied, thanks Dan.
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH net-next] ibmvnic: Potential NULL dereference in clean_one_tx_pool()
@ 2018-03-26 1:14 ` David Miller
0 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2018-03-26 1:14 UTC (permalink / raw)
To: dan.carpenter
Cc: benh, tlfalcon, jallen, paulus, mpe, netdev, linuxppc-dev,
kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 23 Mar 2018 14:36:15 +0300
> There is an && vs || typo here, which potentially leads to a NULL
> dereference.
>
> Fixes: e9e1e97884b7 ("ibmvnic: Update TX pool cleaning routine")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied, thanks Dan.
^ permalink raw reply [flat|nested] 8+ messages in thread