* [PATCH] net: dsa: b53: Fix dereference of null dev
@ 2021-06-12 14:44 Colin King
2021-06-12 15:02 ` Vladimir Oltean
2021-06-14 11:28 ` Dan Carpenter
0 siblings, 2 replies; 4+ messages in thread
From: Colin King @ 2021-06-12 14:44 UTC (permalink / raw)
To: Florian Fainelli, Andrew Lunn, Vivien Didelot, Vladimir Oltean,
David S . Miller, Jakub Kicinski, netdev
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
Currently pointer priv is dereferencing dev before dev is being null
checked so a potential null pointer dereference can occur. Fix this
by only assigning and using priv if dev is not-null.
Addresses-Coverity: ("Dereference before null check")
Fixes: 16994374a6fc ("net: dsa: b53: Make SRAB driver manage port interrupts")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/net/dsa/b53/b53_srab.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/net/dsa/b53/b53_srab.c b/drivers/net/dsa/b53/b53_srab.c
index aaa12d73784e..e77ac598f859 100644
--- a/drivers/net/dsa/b53/b53_srab.c
+++ b/drivers/net/dsa/b53/b53_srab.c
@@ -629,11 +629,13 @@ static int b53_srab_probe(struct platform_device *pdev)
static int b53_srab_remove(struct platform_device *pdev)
{
struct b53_device *dev = platform_get_drvdata(pdev);
- struct b53_srab_priv *priv = dev->priv;
- b53_srab_intr_set(priv, false);
- if (dev)
+ if (dev) {
+ struct b53_srab_priv *priv = dev->priv;
+
+ b53_srab_intr_set(priv, false);
b53_switch_remove(dev);
+ }
return 0;
}
--
2.31.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] net: dsa: b53: Fix dereference of null dev
2021-06-12 14:44 [PATCH] net: dsa: b53: Fix dereference of null dev Colin King
@ 2021-06-12 15:02 ` Vladimir Oltean
2021-06-14 11:28 ` Dan Carpenter
1 sibling, 0 replies; 4+ messages in thread
From: Vladimir Oltean @ 2021-06-12 15:02 UTC (permalink / raw)
To: Colin King
Cc: Florian Fainelli, Andrew Lunn, Vivien Didelot, David S . Miller,
Jakub Kicinski, netdev, kernel-janitors, linux-kernel
On Sat, Jun 12, 2021 at 03:44:07PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently pointer priv is dereferencing dev before dev is being null
> checked so a potential null pointer dereference can occur. Fix this
> by only assigning and using priv if dev is not-null.
>
> Addresses-Coverity: ("Dereference before null check")
> Fixes: 16994374a6fc ("net: dsa: b53: Make SRAB driver manage port interrupts")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> drivers/net/dsa/b53/b53_srab.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/dsa/b53/b53_srab.c b/drivers/net/dsa/b53/b53_srab.c
> index aaa12d73784e..e77ac598f859 100644
> --- a/drivers/net/dsa/b53/b53_srab.c
> +++ b/drivers/net/dsa/b53/b53_srab.c
> @@ -629,11 +629,13 @@ static int b53_srab_probe(struct platform_device *pdev)
> static int b53_srab_remove(struct platform_device *pdev)
> {
> struct b53_device *dev = platform_get_drvdata(pdev);
> - struct b53_srab_priv *priv = dev->priv;
>
> - b53_srab_intr_set(priv, false);
> - if (dev)
> + if (dev) {
> + struct b53_srab_priv *priv = dev->priv;
> +
> + b53_srab_intr_set(priv, false);
> b53_switch_remove(dev);
> + }
>
> return 0;
> }
> --
> 2.31.1
>
I think the better question is how can "dev" be NULL in the first
place, since b53_srab_probe() does an unconditional platform_set_drvdata()
with what appears to be a non-NULL dev.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] net: dsa: b53: Fix dereference of null dev
2021-06-12 14:44 [PATCH] net: dsa: b53: Fix dereference of null dev Colin King
2021-06-12 15:02 ` Vladimir Oltean
@ 2021-06-14 11:28 ` Dan Carpenter
2021-06-15 8:33 ` Colin Ian King
1 sibling, 1 reply; 4+ messages in thread
From: Dan Carpenter @ 2021-06-14 11:28 UTC (permalink / raw)
To: Colin King
Cc: Florian Fainelli, Andrew Lunn, Vivien Didelot, Vladimir Oltean,
David S . Miller, Jakub Kicinski, netdev, kernel-janitors,
linux-kernel
On Sat, Jun 12, 2021 at 03:44:07PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently pointer priv is dereferencing dev before dev is being null
> checked so a potential null pointer dereference can occur. Fix this
> by only assigning and using priv if dev is not-null.
>
> Addresses-Coverity: ("Dereference before null check")
> Fixes: 16994374a6fc ("net: dsa: b53: Make SRAB driver manage port interrupts")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> drivers/net/dsa/b53/b53_srab.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/dsa/b53/b53_srab.c b/drivers/net/dsa/b53/b53_srab.c
> index aaa12d73784e..e77ac598f859 100644
> --- a/drivers/net/dsa/b53/b53_srab.c
> +++ b/drivers/net/dsa/b53/b53_srab.c
> @@ -629,11 +629,13 @@ static int b53_srab_probe(struct platform_device *pdev)
> static int b53_srab_remove(struct platform_device *pdev)
> {
> struct b53_device *dev = platform_get_drvdata(pdev);
> - struct b53_srab_priv *priv = dev->priv;
>
> - b53_srab_intr_set(priv, false);
> - if (dev)
> + if (dev) {
This is the remove function and "dev" can't be NULL at this point.
Better to just remove the NULL check.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] net: dsa: b53: Fix dereference of null dev
2021-06-14 11:28 ` Dan Carpenter
@ 2021-06-15 8:33 ` Colin Ian King
0 siblings, 0 replies; 4+ messages in thread
From: Colin Ian King @ 2021-06-15 8:33 UTC (permalink / raw)
To: Dan Carpenter
Cc: Florian Fainelli, Andrew Lunn, Vivien Didelot, Vladimir Oltean,
David S . Miller, Jakub Kicinski, netdev, kernel-janitors,
linux-kernel
On 14/06/2021 12:28, Dan Carpenter wrote:
> On Sat, Jun 12, 2021 at 03:44:07PM +0100, Colin King wrote:
>> From: Colin Ian King <colin.king@canonical.com>
>>
>> Currently pointer priv is dereferencing dev before dev is being null
>> checked so a potential null pointer dereference can occur. Fix this
>> by only assigning and using priv if dev is not-null.
>>
>> Addresses-Coverity: ("Dereference before null check")
>> Fixes: 16994374a6fc ("net: dsa: b53: Make SRAB driver manage port interrupts")
>> Signed-off-by: Colin Ian King <colin.king@canonical.com>
>> ---
>> drivers/net/dsa/b53/b53_srab.c | 8 +++++---
>> 1 file changed, 5 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/net/dsa/b53/b53_srab.c b/drivers/net/dsa/b53/b53_srab.c
>> index aaa12d73784e..e77ac598f859 100644
>> --- a/drivers/net/dsa/b53/b53_srab.c
>> +++ b/drivers/net/dsa/b53/b53_srab.c
>> @@ -629,11 +629,13 @@ static int b53_srab_probe(struct platform_device *pdev)
>> static int b53_srab_remove(struct platform_device *pdev)
>> {
>> struct b53_device *dev = platform_get_drvdata(pdev);
>> - struct b53_srab_priv *priv = dev->priv;
>>
>> - b53_srab_intr_set(priv, false);
>> - if (dev)
>> + if (dev) {
>
> This is the remove function and "dev" can't be NULL at this point.
> Better to just remove the NULL check.
Will do.
>
> regards,
> dan carpenter
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-06-15 8:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-12 14:44 [PATCH] net: dsa: b53: Fix dereference of null dev Colin King
2021-06-12 15:02 ` Vladimir Oltean
2021-06-14 11:28 ` Dan Carpenter
2021-06-15 8:33 ` Colin Ian King
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.