[PATCH] nfc: netlink: avoid NULL pointer dereference on error

From: Vincent StehlÃ
Date: Wed Oct 07 2015 - 05:33:44 EST


The function nfc_genl_llc_sdreq() can dereference the dev pointer while
it is NULL on its error path. Create a new error handling label to avoid
that.

This fixes the following coccinelle error:

./net/nfc/netlink.c:1175:21-24: ERROR: dev is NULL but dereferenced.

Signed-off-by: Vincent Stehlà <vincent.stehle@xxxxxxxxxxx>
Cc: Thierry Escande <thierry.escande@xxxxxxxxxxxxxxx>
Cc: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
---
net/nfc/netlink.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
index 853172c..51c48f0 100644
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
@@ -1111,7 +1111,7 @@ static int nfc_genl_llc_sdreq(struct sk_buff *skb, struct genl_info *info)
dev = nfc_get_device(idx);
if (!dev) {
rc = -ENODEV;
- goto exit;
+ goto exit_nodev;
}

device_lock(&dev->dev);
@@ -1176,6 +1176,7 @@ exit:

nfc_put_device(dev);

+exit_nodev:
return rc;
}

--
2.5.1

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