[PATCH 1/2] NFC: delete null dereference

From	Julia Lawall <Julia.Lawall@lip6.fr>
Newsgroups	linux.kernel
Subject	[PATCH 1/2] NFC: delete null dereference
Date	2015-10-17 11:50 +0200
Message-ID	<qkwhJ-1Ly-25@gated-at.bofh.it> (permalink)
References	<qkwhI-1Ly-21@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

The exit label performs device_unlock(&dev->dev);, which will fail when dev
is NULL, and nfc_put_device(dev);, which is not useful when dev is NULL, so
just exit the function immediately.

Problem found using scripts/coccinelle/null/deref_null.cocci

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

---
 net/nfc/netlink.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
index 853172c..f040532 100644
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
@@ -1109,10 +1109,8 @@ static int nfc_genl_llc_sdreq(struct sk_buff *skb, struct genl_info *info)
 	idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
 
 	dev = nfc_get_device(idx);
-	if (!dev) {
-		rc = -ENODEV;
-		goto exit;
-	}
+	if (!dev)
+		return -ENODEV;
 
 	device_lock(&dev->dev);
 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 1/2] NFC: delete null dereference Julia Lawall <Julia.Lawall@lip6.fr> - 2015-10-17 11:50 +0200

csiph-web