* [PATCH][next] net: dsa: fix dereference on ds->dev before null check error
@ 2019-10-24 10:32 Colin King
2019-10-24 11:58 ` Andrew Lunn
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Colin King @ 2019-10-24 10:32 UTC (permalink / raw)
To: Andrew Lunn, Vivien Didelot, Florian Fainelli, David S . Miller,
Jakub Kicinski, netdev
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
Currently ds->dev is dereferenced on the assignments of pdata and
np before ds->dev is null checked, hence there is a potential null
pointer dereference on ds->dev. Fix this by assigning pdata and
np after the ds->dev null pointer sanity check.
Addresses-Coverity: ("Dereference before null check")
Fixes: 7e99e3470172 ("net: dsa: remove dsa_switch_alloc helper")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
net/dsa/dsa2.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 1e3ac9b56c89..214dd703b0cc 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -842,13 +842,16 @@ static int dsa_switch_add(struct dsa_switch *ds)
static int dsa_switch_probe(struct dsa_switch *ds)
{
- struct dsa_chip_data *pdata = ds->dev->platform_data;
- struct device_node *np = ds->dev->of_node;
+ struct dsa_chip_data *pdata;
+ struct device_node *np;
int err;
if (!ds->dev)
return -ENODEV;
+ pdata = ds->dev->platform_data;
+ np = ds->dev->of_node;
+
if (!ds->num_ports)
return -EINVAL;
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH][next] net: dsa: fix dereference on ds->dev before null check error
2019-10-24 10:32 [PATCH][next] net: dsa: fix dereference on ds->dev before null check error Colin King
@ 2019-10-24 11:58 ` Andrew Lunn
2019-10-24 16:39 ` Florian Fainelli
2019-10-24 16:47 ` Vivien Didelot
2 siblings, 0 replies; 4+ messages in thread
From: Andrew Lunn @ 2019-10-24 11:58 UTC (permalink / raw)
To: Colin King
Cc: Vivien Didelot, Florian Fainelli, David S . Miller,
Jakub Kicinski, netdev, kernel-janitors, linux-kernel
On Thu, Oct 24, 2019 at 11:32:18AM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently ds->dev is dereferenced on the assignments of pdata and
> np before ds->dev is null checked, hence there is a potential null
> pointer dereference on ds->dev. Fix this by assigning pdata and
> np after the ds->dev null pointer sanity check.
>
> Addresses-Coverity: ("Dereference before null check")
> Fixes: 7e99e3470172 ("net: dsa: remove dsa_switch_alloc helper")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH][next] net: dsa: fix dereference on ds->dev before null check error
2019-10-24 10:32 [PATCH][next] net: dsa: fix dereference on ds->dev before null check error Colin King
2019-10-24 11:58 ` Andrew Lunn
@ 2019-10-24 16:39 ` Florian Fainelli
2019-10-24 16:47 ` Vivien Didelot
2 siblings, 0 replies; 4+ messages in thread
From: Florian Fainelli @ 2019-10-24 16:39 UTC (permalink / raw)
To: Colin King, Andrew Lunn, Vivien Didelot, David S . Miller,
Jakub Kicinski, netdev
Cc: kernel-janitors, linux-kernel
On 10/24/19 3:32 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently ds->dev is dereferenced on the assignments of pdata and
> np before ds->dev is null checked, hence there is a potential null
> pointer dereference on ds->dev. Fix this by assigning pdata and
> np after the ds->dev null pointer sanity check.
>
> Addresses-Coverity: ("Dereference before null check")
> Fixes: 7e99e3470172 ("net: dsa: remove dsa_switch_alloc helper")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
and while we are at it:
Reported-by: kbuild test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
[linux-next:master 5983/6376] net/dsa/dsa2.c:849 dsa_switch_probe()
warn: variable dereferenced before check 'ds->dev' (see line 845)
> ---
> net/dsa/dsa2.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
> index 1e3ac9b56c89..214dd703b0cc 100644
> --- a/net/dsa/dsa2.c
> +++ b/net/dsa/dsa2.c
> @@ -842,13 +842,16 @@ static int dsa_switch_add(struct dsa_switch *ds)
>
> static int dsa_switch_probe(struct dsa_switch *ds)
> {
> - struct dsa_chip_data *pdata = ds->dev->platform_data;
> - struct device_node *np = ds->dev->of_node;
> + struct dsa_chip_data *pdata;
> + struct device_node *np;
> int err;
>
> if (!ds->dev)
> return -ENODEV;
>
> + pdata = ds->dev->platform_data;
> + np = ds->dev->of_node;
> +
> if (!ds->num_ports)
> return -EINVAL;
>
>
--
Florian
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH][next] net: dsa: fix dereference on ds->dev before null check error
2019-10-24 10:32 [PATCH][next] net: dsa: fix dereference on ds->dev before null check error Colin King
2019-10-24 11:58 ` Andrew Lunn
2019-10-24 16:39 ` Florian Fainelli
@ 2019-10-24 16:47 ` Vivien Didelot
2 siblings, 0 replies; 4+ messages in thread
From: Vivien Didelot @ 2019-10-24 16:47 UTC (permalink / raw)
To: Colin King
Cc: Andrew Lunn, Florian Fainelli, David S . Miller, Jakub Kicinski,
netdev, kernel-janitors, linux-kernel
On Thu, 24 Oct 2019 11:32:18 +0100, Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently ds->dev is dereferenced on the assignments of pdata and
> np before ds->dev is null checked, hence there is a potential null
> pointer dereference on ds->dev. Fix this by assigning pdata and
> np after the ds->dev null pointer sanity check.
>
> Addresses-Coverity: ("Dereference before null check")
> Fixes: 7e99e3470172 ("net: dsa: remove dsa_switch_alloc helper")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Vivien Didelot <vivien.didelot@gmail.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-10-24 16:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-24 10:32 [PATCH][next] net: dsa: fix dereference on ds->dev before null check error Colin King
2019-10-24 11:58 ` Andrew Lunn
2019-10-24 16:39 ` Florian Fainelli
2019-10-24 16:47 ` Vivien Didelot
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).