diff options
author | Pan Bian <bianpan2016@163.com> | 2019-11-07 14:29:50 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-12 19:13:17 +0100 |
commit | 73463008aa79f22edafaf922ec6f8100b0e66bdc (patch) | |
tree | eec36edac2ddbeaa883427d8fd085ec43ea00d0f /net/nfc | |
parent | 9025d23cfc30c1c75f912533147ee85e826f7001 (diff) | |
download | linux-stable-73463008aa79f22edafaf922ec6f8100b0e66bdc.tar.gz linux-stable-73463008aa79f22edafaf922ec6f8100b0e66bdc.tar.bz2 linux-stable-73463008aa79f22edafaf922ec6f8100b0e66bdc.zip |
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: 52feb444a903 ("NFC: Extend netlink interface for LTO, RW, and MIUX parameters support")
Fixes: d9b8d8e19b07 ("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>
Diffstat (limited to 'net/nfc')
-rw-r--r-- | net/nfc/netlink.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c index 80def98c9dba..04d4c388a7a8 100644 --- a/net/nfc/netlink.c +++ b/net/nfc/netlink.c @@ -1066,7 +1066,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; } @@ -1126,7 +1125,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; } |