Commit 6c234cb7 authored Nov 07, 2019 by Pan Bian Committed by Greg Kroah-Hartman Nov 12, 2019

nfc: netlink: fix double device reference drop



[ Upstream commit 025ec40b81d785a98f76b8bdb509ac10773b4f12 ]

The function nfc_put_device(dev) is called twice to drop the reference
to dev when there is no associated local llcp. Remove one of them to fix
the bug.

Fixes: 52feb444 ("NFC: Extend netlink interface for LTO, RW, and MIUX parameters support")
Fixes: d9b8d8e1 ("NFC: llcp: Service Name Lookup netlink interface")
Signed-off-by: Pan Bian <bianpan2016@163.com>
Reviewed-by: Johan Hovold <johan@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 5f311e37

net/nfc/netlink.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1100,7 +1100,6 @@ static int nfc_genl_llc_set_params(struct sk_buff skb, struct genl_info info)

		local = nfc_llcp_find_local(dev);
		if (!local) {
		nfc_put_device(dev);
		rc = -ENODEV;
		goto exit;
		}
		@@ -1160,7 +1159,6 @@ static int nfc_genl_llc_sdreq(struct sk_buff skb, struct genl_info info)

		local = nfc_llcp_find_local(dev);
		if (!local) {
		nfc_put_device(dev);
		rc = -ENODEV;
		goto exit;
		}