linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] net: qualcomm: rmnet: move null check on dev before dereferecing it
@ 2018-11-24 15:03 Colin King
  2018-11-25  1:40 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Colin King @ 2018-11-24 15:03 UTC (permalink / raw)
  To: David S . Miller, Subash Abhinov Kasiviswanathan, netdev
  Cc: kernel-janitors, linux-kernel

From: Colin Ian King <colin.king@canonical.com>

Currently dev is dereferenced by the call dev_net(dev) before dev is null
checked.  Fix this by null checking dev before the potential null
pointer dereference.

Detected by CoverityScan, CID#1462955 ("Dereference before null check")

Fixes: 23790ef12082 ("net: qualcomm: rmnet: Allow to configure flags for existing devices")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c
index 5f4e447c5dce..b8bbee645f51 100644
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c
@@ -301,10 +301,13 @@ static int rmnet_changelink(struct net_device *dev, struct nlattr *tb[],
 	struct rmnet_port *port;
 	u16 mux_id;
 
+	if (!dev)
+		return -ENODEV;
+
 	real_dev = __dev_get_by_index(dev_net(dev),
 				      nla_get_u32(tb[IFLA_LINK]));
 
-	if (!real_dev || !dev || !rmnet_is_real_dev_registered(real_dev))
+	if (!real_dev || !rmnet_is_real_dev_registered(real_dev))
 		return -ENODEV;
 
 	port = rmnet_get_port_rtnl(real_dev);
-- 
2.19.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] net: qualcomm: rmnet: move null check on dev before dereferecing it
  2018-11-24 15:03 [PATCH] net: qualcomm: rmnet: move null check on dev before dereferecing it Colin King
@ 2018-11-25  1:40 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2018-11-25  1:40 UTC (permalink / raw)
  To: colin.king; +Cc: subashab, netdev, kernel-janitors, linux-kernel

From: Colin King <colin.king@canonical.com>
Date: Sat, 24 Nov 2018 15:03:02 +0000

> From: Colin Ian King <colin.king@canonical.com>
> 
> Currently dev is dereferenced by the call dev_net(dev) before dev is null
> checked.  Fix this by null checking dev before the potential null
> pointer dereference.
> 
> Detected by CoverityScan, CID#1462955 ("Dereference before null check")
> 
> Fixes: 23790ef12082 ("net: qualcomm: rmnet: Allow to configure flags for existing devices")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

Applied to net-next.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-11-25  1:40 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-24 15:03 [PATCH] net: qualcomm: rmnet: move null check on dev before dereferecing it Colin King
2018-11-25  1:40 ` David Miller

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).