From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFC3AC17445 for ; Mon, 11 Nov 2019 19:10:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C8F3B204EC for ; Mon, 11 Nov 2019 19:10:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573499451; bh=J8WU9s4Yvlc/5k+WEebL8u3BPakjSswoLvQwroJOOIk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KhapeaDI0BpGDTzn47GCjQuK59FK665dl3JIWsmOeBEZGLNRFOXwC4ztK8oP4V4ml hcnVYFmm5szWIwgI/mvyZJNoKh2PUzhnUp2AgEXuVm1njXboCEo7CVB9dnqx15rCUc 5TVdgylyRH1LkXS45qRXoinxV2L5uEP35fvPbLO0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727705AbfKKSbi (ORCPT ); Mon, 11 Nov 2019 13:31:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:48242 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727696AbfKKSbh (ORCPT ); Mon, 11 Nov 2019 13:31:37 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 44970214E0; Mon, 11 Nov 2019 18:31:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573497096; bh=J8WU9s4Yvlc/5k+WEebL8u3BPakjSswoLvQwroJOOIk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dF43U5wQxIhDfagfKT35J3feb6M6f563fZ5n2mB3KKJb2Ez2UCHmQxdb9s01PSi0C JXjQCaqJGzP7HgNseNG2tTC+mZePiiKX7FLhqK+PUBuHUgmxUBQU/zJHQlD3dNV7FF j2CkhrwA/9WxRCUEqu+qrS+rBvencwSA0tJ18H+E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pan Bian , Johan Hovold , "David S. Miller" Subject: [PATCH 4.4 06/43] nfc: netlink: fix double device reference drop Date: Mon, 11 Nov 2019 19:28:20 +0100 Message-Id: <20191111181255.615068286@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181246.772983347@linuxfoundation.org> References: <20191111181246.772983347@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Pan Bian [ 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 Reviewed-by: Johan Hovold Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/nfc/netlink.c | 2 -- 1 file changed, 2 deletions(-) --- a/net/nfc/netlink.c +++ b/net/nfc/netlink.c @@ -1066,7 +1066,6 @@ static int nfc_genl_llc_set_params(struc 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_ local = nfc_llcp_find_local(dev); if (!local) { - nfc_put_device(dev); rc = -ENODEV; goto exit; }