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=ham 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 59C4FC17441 for ; Mon, 11 Nov 2019 18:36:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 27A32214E0 for ; Mon, 11 Nov 2019 18:36:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573497416; bh=LhPWK2V7Segxol/WkLGxQ23Hr9rDFRaY8YxQpfE+9KI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DRk1ag6mvh1qYtFtMVJODGrxwfKcm2YSEPY0+xwVlVUbSPx16RSnwiqnusoGunphJ +OdNwOge3wK/ngPiz9emlfTaLb35XwBRXjMnMMMqRAMM4lld3bn6VCDFhaAwK3or3W uOxza0Ay50QqW5dtV76ydyPE5l38e9U7Pl0Gjrpg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728037AbfKKSgz (ORCPT ); Mon, 11 Nov 2019 13:36:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:55424 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727746AbfKKSgx (ORCPT ); Mon, 11 Nov 2019 13:36:53 -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 7CAC3204FD; Mon, 11 Nov 2019 18:36:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573497413; bh=LhPWK2V7Segxol/WkLGxQ23Hr9rDFRaY8YxQpfE+9KI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ISsINZ5NrXUqWzIJP3IK1z4z+h239+GX/Of3JvjdFplniPH+/oJSYhp/n2feeafW1 1Gg4/rHMQ8Yh8sWt+TvJlPruKYiXMk3qvtvxZbYlMJZynDb6xRVdwIY6oAAgZHCrHL lnxnsjP0G5QV2yi1ueXKD+vzTdyCGM8WFWIHky7A= 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.14 009/105] nfc: netlink: fix double device reference drop Date: Mon, 11 Nov 2019 19:27:39 +0100 Message-Id: <20191111181426.141943937@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181421.390326245@linuxfoundation.org> References: <20191111181421.390326245@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 @@ -1100,7 +1100,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; } @@ -1160,7 +1159,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; }