summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2015-10-17 11:32:19 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2015-10-19 20:10:37 +0200
commit9abebb8a10ce93db45327bd3a4d06801e6db92f2 (patch)
treea968400c5287a50c57b4126bd05676b33e3e095e
parentb43ef78145b10a3fb81a59596d562f21d9bab8d2 (diff)
NFC: delete null dereference
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> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--net/nfc/netlink.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
index 853172c27f68..f04053295ff1 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);