diff mbox

[1/2] nfc: fix NULL pointer dereference

Message ID 20540404.Au0OUqzobS@daeseok-laptop.cloud.net (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Daeseok Youn April 2, 2014, 7:55 a.m. UTC
dev is NULL when nfc_get_device() is failed but
dev is used for handling error.

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

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
---
 net/nfc/netlink.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

Comments

Daeseok Youn April 14, 2014, 2:19 a.m. UTC | #1
Hi,

Can you review this patch?

Thanks.
Daeseok Youn

2014-04-02 16:55 GMT+09:00 Daeseok Youn <daeseok.youn@gmail.com>:
>
> dev is NULL when nfc_get_device() is failed but
> dev is used for handling error.
>
> coccicheck says:
>  net/nfc/netlink.c:1092:21-24: ERROR:
> dev is NULL but dereferenced.
>
> Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
> ---
>  net/nfc/netlink.c |    6 ++----
>  1 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
> index 43cb1c1..b2ad570 100644
> --- a/net/nfc/netlink.c
> +++ b/net/nfc/netlink.c
> @@ -1026,10 +1026,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);
>
> --
> 1.7.4.4
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
index 43cb1c1..b2ad570 100644
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
@@ -1026,10 +1026,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);