From 556f124fb30621df3089d624ac57f13744712753 Mon Sep 17 00:00:00 2001 From: Colin Ian King Date: Thu, 24 Oct 2019 11:32:18 +0100 Subject: net: dsa: fix dereference on ds->dev before null check error 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 Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli Reported-by: kbuild test robot Reported-by: Dan Carpenter Reviewed-by: Vivien Didelot Signed-off-by: David S. Miller --- net/dsa/dsa2.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'net/dsa') 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; -- cgit v1.2.3-59-g8ed1b