From nobody Tue Jun 23 16:17:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED90AC433EF for ; Wed, 2 Mar 2022 19:25:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239881AbiCBT0U (ORCPT ); Wed, 2 Mar 2022 14:26:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238096AbiCBT0N (ORCPT ); Wed, 2 Mar 2022 14:26:13 -0500 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31CD3C1176 for ; Wed, 2 Mar 2022 11:25:30 -0800 (PST) Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 052A63F610 for ; Wed, 2 Mar 2022 19:25:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646249129; bh=KE7cA2DH2YKQP2Gc57E040M9nuLXTd4XcLilkBUwOrw=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=M6+ZmeyUa0f9+qsyxIBFU6jul8m1gPi4EUzBxgT0hpNFpLlotPV7LFVG71tQORM7v 93xIiTGcmH75SA8wTKY9ZHbma9l4S3VgFI189B/bRip1q/4DsOQCYDAhvAEZyrF3YR LkvNmsyW4oYRk32QLlgGy4K4QfxNNv9fTkuFfOfjGc1EbXRebm7acFemMKe223MFIc QYa52nRgj2wUkBzGiboa5Lzkokb/wJBJSxuo6zxyrNwOf+NdY6kqr/J/gUa07rtQiP 2B1/iNdMIS1Ln8wTCHmnBvE9BrIDBaN07+HjQXU8krDjTxBDOTDKhK+pXiCXIb0PIe Y+pVKo4LdeZXg== Received: by mail-ej1-f69.google.com with SMTP id qf24-20020a1709077f1800b006ce8c140d3dso1480331ejc.18 for ; Wed, 02 Mar 2022 11:25:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KE7cA2DH2YKQP2Gc57E040M9nuLXTd4XcLilkBUwOrw=; b=JeqCsgls6guqY+hrmE4B6TF9WT2310p1OLtDxN2zbaYtdJHtwiXh6egg/et3OOdEcA nBcfuy5QzE1x315IkW/OvZ88J1wQAhtM9sFxOiLNaelYUNPyPTpepgu/ocv+PDqSA9Lr /kO4i1Uk0XLMsYb71bJYe4todI9kW/gmdwGR0pz59h2VJgogvvJt5FPTzkGxnRJyn6LW 9DiokWbxCB44L1g+2pDZjIchkMkortV9lcfHs7SsMzLG/rOz7ix3tduFZJcYzq8ELPCK NeiYMBuy3Or6S1EtkGnJ+j51pkS4uh0A7EYYQx+hN2z3bKQvqFCVji5j9DhGJmevVzwn ysMw== X-Gm-Message-State: AOAM533ac37qr2W5ztChYTG0Cd0KQMukaXot+gdcBbiwOROOko4jubJl t2yRhlqI5fOUE7Z+Inh4FFBQ5ilFwmGtrZTRwCo00dpHyUTtmNG0tvZAYXqOUDe1cgby9bmC22H NPCELnfHwU5c4kTBLJPRndSLo3CUqIxGFzfGToAXn0A== X-Received: by 2002:a05:6402:369c:b0:413:2bc0:3f00 with SMTP id ej28-20020a056402369c00b004132bc03f00mr30801302edb.126.1646249128344; Wed, 02 Mar 2022 11:25:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJzj6ncNvbB8cHRaUtjFkSKVI4lc6ShTlpArR4gywnj3ywk9IVqiotnQYISrRs1enqnteey6vg== X-Received: by 2002:a05:6402:369c:b0:413:2bc0:3f00 with SMTP id ej28-20020a056402369c00b004132bc03f00mr30801289edb.126.1646249128190; Wed, 02 Mar 2022 11:25:28 -0800 (PST) Received: from localhost.localdomain (xdsl-188-155-181-108.adslplus.ch. [188.155.181.108]) by smtp.gmail.com with ESMTPSA id i14-20020a50cfce000000b00415b0730921sm1482765edk.42.2022.03.02.11.25.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Mar 2022 11:25:27 -0800 (PST) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH v2 1/6] nfc: llcp: nullify llcp_sock->dev on connect() error paths Date: Wed, 2 Mar 2022 20:25:18 +0100 Message-Id: <20220302192523.57444-2-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220302192523.57444-1-krzysztof.kozlowski@canonical.com> References: <20220302192523.57444-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Nullify the llcp_sock->dev on llcp_sock_connect() error paths, symmetrically to the code llcp_sock_bind(). The non-NULL value of llcp_sock->dev is used in a few places to check whether the socket is still valid. There was no particular issue observed with missing NULL assignment in connect() error path, however a similar case - in the bind() error path - was triggereable. That one was fixed in commit 4ac06a1e013c ("nfc: fix NULL ptr dereference in llcp_sock_getname() after failed connect"), so the change here seems logical as well. Signed-off-by: Krzysztof Kozlowski --- net/nfc/llcp_sock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c index 0b93a17b9f11..e92440c0c4c7 100644 --- a/net/nfc/llcp_sock.c +++ b/net/nfc/llcp_sock.c @@ -764,6 +764,7 @@ static int llcp_sock_connect(struct socket *sock, struc= t sockaddr *_addr, llcp_sock->local =3D NULL; =20 put_dev: + llcp_sock->dev =3D NULL; nfc_put_device(dev); =20 error: --=20 2.32.0 From nobody Tue Jun 23 16:17:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15AF9C433EF for ; Wed, 2 Mar 2022 19:25:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239999AbiCBT00 (ORCPT ); Wed, 2 Mar 2022 14:26:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238923AbiCBT0Q (ORCPT ); Wed, 2 Mar 2022 14:26:16 -0500 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32C3CC12CA for ; Wed, 2 Mar 2022 11:25:32 -0800 (PST) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 8376A3F5F2 for ; Wed, 2 Mar 2022 19:25:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646249130; bh=ePWS8huBNB8mOLwzP5l9zhhnqwr/R2aV/N6dfRb+pkA=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OqDB+l+JRV4MPEmDj4lf32cqG+Pt9SxR6kg7Ds+fid5NhbPhKD2YmaOcgycudK/jb AHMMF+l7d1/ic2htSTd8NfnotJGKiyLYH5GDXu29JSrNsoJxIEbaW5IbfoHoQ08+s0 Iw+ZvwLnEijCMPmyuSp6qyXE6dsBNVsrxCiCNUCd+EseiO9/b491j39JmkA7ohEmp8 y2XvzR+0ebxKudBRT87KoIvZD3RAgT9Bz7LEXfwoUsTfP+OKVVV+T4brfWKceAsdIT ROCqOZOebBsUTko+zdZ3rEymQl8VUdMsw3qZtnuK0Tw1sBHFX8S/9bQww2u/5bk5Z3 2XiDAZLP9bk5w== Received: by mail-ed1-f69.google.com with SMTP id s7-20020a508dc7000000b0040f29ccd65aso1554307edh.1 for ; Wed, 02 Mar 2022 11:25:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ePWS8huBNB8mOLwzP5l9zhhnqwr/R2aV/N6dfRb+pkA=; b=GHJKLFdKZjVxHQS/zGSbeaSrVdo4ZW/KfXP0r9tznb1VIgVNqOhsMJzZtDJOXDtZTl uRbPQXVvRlwSck6biR8c/KAe+NfT6hoOdKjmSxdKuB7F+cpf6JuDe9GIvFMooz/mtHk3 NbMToVTC7sKfSw3TOpo2QyHaxFIe7t4Jsd1jqNVacKLYSo5TZ2F+QSwL73RWINbHoSYh kMizZptRSE7qZQj10lFy1Ooz0ffPjtMmvH3GMZ2mLGQ7Hhb9CZI3X4yKq6G04Dlu55F4 NVKsSeb1xB+0c4TqeSdhGrE+xHjpS/NjDSXIl2I/v3AJ5LsczRpTfoICcCJYiSwBKf+S 7r+A== X-Gm-Message-State: AOAM533fwMdlaxhZfomYTmwigBdKQZH7Ghg8vgW8Np1jeImIJWJljtsL VFJWsWcShrXi+Z21/2tIOEySzv3WzHtF139aOexY0Rc/IFUuHh6meiwYkyKYIXPImXNpFimwaA4 vpu3SH/Oe+oeatFMv/F2ZPH36iemZt3ffPse22vvS9Q== X-Received: by 2002:aa7:d706:0:b0:415:a00b:4ee with SMTP id t6-20020aa7d706000000b00415a00b04eemr7325276edq.373.1646249129876; Wed, 02 Mar 2022 11:25:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJxFEFY4wLULZr/eBfkoQpBWjtr5OGYAVw5KfG35wQ8ZmBORByJ1wBNLn5MUEWgSX4YDGpFhpg== X-Received: by 2002:aa7:d706:0:b0:415:a00b:4ee with SMTP id t6-20020aa7d706000000b00415a00b04eemr7325252edq.373.1646249129662; Wed, 02 Mar 2022 11:25:29 -0800 (PST) Received: from localhost.localdomain (xdsl-188-155-181-108.adslplus.ch. [188.155.181.108]) by smtp.gmail.com with ESMTPSA id i14-20020a50cfce000000b00415b0730921sm1482765edk.42.2022.03.02.11.25.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Mar 2022 11:25:28 -0800 (PST) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH v2 2/6] nfc: llcp: simplify llcp_sock_connect() error paths Date: Wed, 2 Mar 2022 20:25:19 +0100 Message-Id: <20220302192523.57444-3-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220302192523.57444-1-krzysztof.kozlowski@canonical.com> References: <20220302192523.57444-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The llcp_sock_connect() error paths were using a mixed way of central exit (goto) and cleanup Signed-off-by: Krzysztof Kozlowski --- net/nfc/llcp_sock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c index e92440c0c4c7..fdf0856182c6 100644 --- a/net/nfc/llcp_sock.c +++ b/net/nfc/llcp_sock.c @@ -712,10 +712,8 @@ static int llcp_sock_connect(struct socket *sock, stru= ct sockaddr *_addr, llcp_sock->local =3D nfc_llcp_local_get(local); llcp_sock->ssap =3D nfc_llcp_get_local_ssap(local); if (llcp_sock->ssap =3D=3D LLCP_SAP_MAX) { - nfc_llcp_local_put(llcp_sock->local); - llcp_sock->local =3D NULL; ret =3D -ENOMEM; - goto put_dev; + goto sock_llcp_put_local; } =20 llcp_sock->reserved_ssap =3D llcp_sock->ssap; @@ -760,11 +758,13 @@ static int llcp_sock_connect(struct socket *sock, str= uct sockaddr *_addr, =20 sock_llcp_release: nfc_llcp_put_ssap(local, llcp_sock->ssap); + +sock_llcp_put_local: nfc_llcp_local_put(llcp_sock->local); llcp_sock->local =3D NULL; + llcp_sock->dev =3D NULL; =20 put_dev: - llcp_sock->dev =3D NULL; nfc_put_device(dev); =20 error: --=20 2.32.0 From nobody Tue Jun 23 16:17:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 400DDC433EF for ; Wed, 2 Mar 2022 19:25:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240297AbiCBT0c (ORCPT ); Wed, 2 Mar 2022 14:26:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238980AbiCBT0Q (ORCPT ); Wed, 2 Mar 2022 14:26:16 -0500 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CEDAC12E0 for ; Wed, 2 Mar 2022 11:25:32 -0800 (PST) Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 594953F5FC for ; Wed, 2 Mar 2022 19:25:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646249131; bh=XW443xLXNMd7fKnAwsj5MsweNUN/P9g1RwySZfWsL7A=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=njcbGLZ4kf+fLgTrGYraZCpASRIabOzayBz6S43a31LaCLpFdZkimOAeSyrpr4iWc hp22Nt8CizcKquzO6O0xCuoF3BpGEUTXjZnFIBe0wZBA8KgGdahgQ2O1Hg8IET7hT7 HCK9eQA5Bd2sswYtD+vto2ep11gx9Dn+DKdlbuunUyCcNwHT2I554VwVo5P57EBEN/ IsfvIUdI/s3k5WeQlYVUu95HUgFxoYqMR3vZs5duMK1i1vXzHWy/iubMLxmCr2jbCJ 8tZ877ko+Eq3aNVDA0IBOJxxRTNIg7znQSFf2VfFsJUl937+V7nsy26VLtPgPMbHGT OM0+1FTqnDHbA== Received: by mail-ej1-f72.google.com with SMTP id m4-20020a170906160400b006be3f85906eso1475952ejd.23 for ; Wed, 02 Mar 2022 11:25:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XW443xLXNMd7fKnAwsj5MsweNUN/P9g1RwySZfWsL7A=; b=iG/r1xSb6by+oQc2GkR/vwo0r0/uyV4C+wjszI8h88AkkCP4PbGeQYcn2fV0nbcFfL 2WG03ai9+l6hEkyifWCYvREEjY62Bhe8cQDF4bXCyxvlhvYrB2wdEXUEaQc+D61xKTts KoB11zVyXIYRPLK/uj3TAwfJlWLY/lfaVPp6oGv1SYXe6JEewhBkH11Jhe9/9zICOBKs MwQSJS8P+2zsF48uoV6RneghM8blgPv20+FmFgwHUQIhgreE3CD2wITsArLhT3c4zBoz busNKtAixt+OHWeVeOJQUcgQau7CUihhj96NUE61UTRt5lXQfMU+1o4zyFP8q4aPMHsb mLxw== X-Gm-Message-State: AOAM531wYemleT/yf/SL08McIRt6QzTci9K4x9ZpolfPXsKomYuIDXNz xfcTalyVgv8xibm/tMJuKigve/a8jNIr+l6zSz3K7TKXyWRLIsRdmGux6RLsye5djN6tx9eE2vm A48qNBeLbxtE6CYLjBejiACLFjBYiHPAWMXj+irl+aA== X-Received: by 2002:a17:906:2f97:b0:6ce:3ef6:94be with SMTP id w23-20020a1709062f9700b006ce3ef694bemr24638073eji.136.1646249131052; Wed, 02 Mar 2022 11:25:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJzsRBR/F3xyyehjGQgAe0B+0iZQvBRbcdylldzaOvYG3TOQZ1QZiyO7oXqhYToX9C8yGar/7A== X-Received: by 2002:a17:906:2f97:b0:6ce:3ef6:94be with SMTP id w23-20020a1709062f9700b006ce3ef694bemr24638059eji.136.1646249130844; Wed, 02 Mar 2022 11:25:30 -0800 (PST) Received: from localhost.localdomain (xdsl-188-155-181-108.adslplus.ch. [188.155.181.108]) by smtp.gmail.com with ESMTPSA id i14-20020a50cfce000000b00415b0730921sm1482765edk.42.2022.03.02.11.25.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Mar 2022 11:25:30 -0800 (PST) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH v2 3/6] nfc: llcp: use centralized exiting of bind on errors Date: Wed, 2 Mar 2022 20:25:20 +0100 Message-Id: <20220302192523.57444-4-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220302192523.57444-1-krzysztof.kozlowski@canonical.com> References: <20220302192523.57444-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Coding style encourages centralized exiting of functions, so rewrite llcp_sock_bind() error paths to use such pattern. This reduces the duplicated cleanup code, make success path visually shorter and also cleans up the errors in proper order (in reversed way from initialization). No functional impact expected. Signed-off-by: Krzysztof Kozlowski --- net/nfc/llcp_sock.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c index fdf0856182c6..c9d5c427f035 100644 --- a/net/nfc/llcp_sock.c +++ b/net/nfc/llcp_sock.c @@ -108,21 +108,13 @@ static int llcp_sock_bind(struct socket *sock, struct= sockaddr *addr, int alen) llcp_sock->service_name_len, GFP_KERNEL); if (!llcp_sock->service_name) { - nfc_llcp_local_put(llcp_sock->local); - llcp_sock->local =3D NULL; - llcp_sock->dev =3D NULL; ret =3D -ENOMEM; - goto put_dev; + goto sock_llcp_put_local; } llcp_sock->ssap =3D nfc_llcp_get_sdp_ssap(local, llcp_sock); if (llcp_sock->ssap =3D=3D LLCP_SAP_MAX) { - nfc_llcp_local_put(llcp_sock->local); - llcp_sock->local =3D NULL; - kfree(llcp_sock->service_name); - llcp_sock->service_name =3D NULL; - llcp_sock->dev =3D NULL; ret =3D -EADDRINUSE; - goto put_dev; + goto free_service_name; } =20 llcp_sock->reserved_ssap =3D llcp_sock->ssap; @@ -132,6 +124,19 @@ static int llcp_sock_bind(struct socket *sock, struct = sockaddr *addr, int alen) pr_debug("Socket bound to SAP %d\n", llcp_sock->ssap); =20 sk->sk_state =3D LLCP_BOUND; + nfc_put_device(dev); + release_sock(sk); + + return 0; + +free_service_name: + kfree(llcp_sock->service_name); + llcp_sock->service_name =3D NULL; + +sock_llcp_put_local: + nfc_llcp_local_put(llcp_sock->local); + llcp_sock->local =3D NULL; + llcp_sock->dev =3D NULL; =20 put_dev: nfc_put_device(dev); --=20 2.32.0 From nobody Tue Jun 23 16:17:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17D7BC433EF for ; Wed, 2 Mar 2022 19:25:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240745AbiCBT0k (ORCPT ); Wed, 2 Mar 2022 14:26:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239806AbiCBT0T (ORCPT ); Wed, 2 Mar 2022 14:26:19 -0500 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 493FEC12F0 for ; Wed, 2 Mar 2022 11:25:36 -0800 (PST) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id B41C23F5FF for ; Wed, 2 Mar 2022 19:25:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646249132; bh=15HOmnObJXsVXxZJ5x/3DtxcDfRhMgZoa5zrHrITnNA=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=m2iWuTsbzZ0fn/Kxc87HP8Lc1/jvXzwP/jkvWD8zKwW1boaOo5y1hRgPW1wGYmJcc ttXoRtM60lZ+cu1wGeS7r/MVffgFYd9DIMCN3etZVkNutEyKLBYdUnoIj7lckWI5MS Vu4ER0iEbVek0XQiQqJewXSgWJvoNqnya3mMAyEos4G0XvvaLnQqPMxQDEDiXmWxSg T/1nrCvTJuyNgnKVDC+liZ2RnE3c00Ai8xz8Obh3S+J2LsFd1Pyovca8QNQIY5EG1r EBmQsy4uBTPm1Q2626iVkSCa+0/YKmyRStvRGLcwce4WMD2b59yV2Otv5idpMFyUqq T1fEWaz8j53hQ== Received: by mail-ej1-f70.google.com with SMTP id nb1-20020a1709071c8100b006d03c250b6fso1486860ejc.11 for ; Wed, 02 Mar 2022 11:25:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=15HOmnObJXsVXxZJ5x/3DtxcDfRhMgZoa5zrHrITnNA=; b=rFOwvijZfdKJPMIZ5CWQDiwa1foS43FhTgHhki/Q7NeWni7Mr7scJOWas7ERPV6oOc qqIaVp4J+MeR+bIiPjmRUETRb3hHoOJ9dSKVw43q5XligDeBLsVOAYSqVRMMD2Yy6Lmv +WATV1wLCxmqqBpKBQ/IuBXL7id8zyJFvvhEaR/fvp/J0GHh35MVM+UWKTGq6MD+dyrL ECbw+K0bWgjQCAeIEweN59Xpf7emj6Ub1jOie+Ty0jHKZheRnml2QdUkq0aKmKjs+tKJ GFZmh2LT5v5rZhSUVqRUVeccyG/4aP4SPW5G1UtYGP6xRix71pi71VDQfQSGLvk2gIQn jdSw== X-Gm-Message-State: AOAM533+YP9Y+yu99eVJaPbDJE/t7c+c5Qce266lBZdKcPsCiEj137Y+ dEspijhikES6ldfQNp2L4wMRQ6iyKzyUducBjWOmgrjSMfuL9HsXhkT2CaUfupQm/6odfGQ6IIb uI9ECAifw2uIlAM9uPGnIhxaWzWIhHfgH1ulVGcnAIA== X-Received: by 2002:a17:906:7751:b0:6ce:e3c:81a6 with SMTP id o17-20020a170906775100b006ce0e3c81a6mr23328454ejn.278.1646249132425; Wed, 02 Mar 2022 11:25:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJzoNWOZ7D/uCsO1FWpSxrBelZ9YFjgouGbue8Nl1lS/Y1LnCK8P6xOlohDZjyDgtT/p5sfpXA== X-Received: by 2002:a17:906:7751:b0:6ce:e3c:81a6 with SMTP id o17-20020a170906775100b006ce0e3c81a6mr23328438ejn.278.1646249132223; Wed, 02 Mar 2022 11:25:32 -0800 (PST) Received: from localhost.localdomain (xdsl-188-155-181-108.adslplus.ch. [188.155.181.108]) by smtp.gmail.com with ESMTPSA id i14-20020a50cfce000000b00415b0730921sm1482765edk.42.2022.03.02.11.25.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Mar 2022 11:25:31 -0800 (PST) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH v2 4/6] nfc: llcp: use test_bit() Date: Wed, 2 Mar 2022 20:25:21 +0100 Message-Id: <20220302192523.57444-5-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220302192523.57444-1-krzysztof.kozlowski@canonical.com> References: <20220302192523.57444-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use test_bit() instead of open-coding it, just like in other places touching the bitmap. Signed-off-by: Krzysztof Kozlowski --- net/nfc/llcp_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/nfc/llcp_core.c b/net/nfc/llcp_core.c index 5ad5157aa9c5..b70d5042bf74 100644 --- a/net/nfc/llcp_core.c +++ b/net/nfc/llcp_core.c @@ -383,7 +383,7 @@ u8 nfc_llcp_get_sdp_ssap(struct nfc_llcp_local *local, pr_debug("WKS %d\n", ssap); =20 /* This is a WKS, let's check if it's free */ - if (local->local_wks & BIT(ssap)) { + if (test_bit(ssap, &local->local_wks)) { mutex_unlock(&local->sdp_lock); =20 return LLCP_SAP_MAX; --=20 2.32.0 From nobody Tue Jun 23 16:17:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D737BC433FE for ; Wed, 2 Mar 2022 19:26:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240578AbiCBT0n (ORCPT ); Wed, 2 Mar 2022 14:26:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240280AbiCBT0c (ORCPT ); Wed, 2 Mar 2022 14:26:32 -0500 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65FBCC12F3 for ; Wed, 2 Mar 2022 11:25:36 -0800 (PST) Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id D81B73F60F for ; Wed, 2 Mar 2022 19:25:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646249134; bh=k1fbxXsPvGzkuFTuMvPObzXkHdaiukX+p5UqHJ6OWe0=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=O2U9gGpVeNUt6D/I0+4d4RaNrfBv0pA8LaErnPR9Dctk6D0zaTr9UFM0+CumJIJ9k ayKkS+22U7QlwbtytlSwumNgVABo5y7hfV/X5zWhMhERAGSCDecjEaCfsuPhPUd1OD bs/bkr0adPa78Zyi/uJpsos3a7EnIJ/AYqJNVDAeynEQAguzkLKUFMHNkumMmZnvwl PJzS7EjwAiw9U55/8+rVpQwnbCIhbLehWxcu7LcB4jYcF6Ss8/1hS2hNP0b10hsuBC uFrVuAEwbYZ34Hr+sUgkx098Hd2XqQj32Gov4JLeZDkxsqOlHS1iImo3A2qBCj3IiS 9pPBFRVBGBm2A== Received: by mail-ej1-f69.google.com with SMTP id k21-20020a1709063e1500b006d0777c06d6so1502863eji.1 for ; Wed, 02 Mar 2022 11:25:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=k1fbxXsPvGzkuFTuMvPObzXkHdaiukX+p5UqHJ6OWe0=; b=DbJfaIBynPFxVeJwwVpeG9hqxhcz1tu3yfNyiSusTnKMXo56cqf17/TRBy7lBe6XPy q/3FY0wHQahkLXBWUit+JQsEvbW47DTQnnQqEeeCv+bG+fRzEznhglohHyKLc/G/6Fo9 1TiJlaB64/TcFaPFRCHqi3KyMspBWBc+UcS/wMIjQxaKAt2l2Ol+VPwLSaLqVqzu7JJJ /DWhL/9LjkR/r+/xqaXcvsqeJw6QkAx6vc31RotSM15YfX5dN8i+ZZr8L8Q+xv4/U+sI BCvMq9u1nvmy50a6k9oaq+hgYutl8V1mCyX+afH02Qqbk36A0P9YQJmDiyxNXEBC6vO8 GcLw== X-Gm-Message-State: AOAM531W9hHZVhDPAPfb9rgVbH0/H6DiE45HkUNunuyM7KATjG/LOoBM tz8BCI4E1oQIg3/5yQpvAaswV0RUNdvb/RiW5qZloo0ImGCrcmn56mCKu8TyYxp7EuL2BEn8cDe jTwmzu+CMEkkzn2GC5dH05Nra/5YECge4XB9mNW84wA== X-Received: by 2002:a17:906:18b2:b0:6d0:ee54:1add with SMTP id c18-20020a17090618b200b006d0ee541addmr24364520ejf.499.1646249134540; Wed, 02 Mar 2022 11:25:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJwQ2Yzk4nLxgx+97QWgQ7U+3qiE+VAfZ5ZxF3hEUaZA9fAEq5MaAHHtVajBlFnerH2vg2MVHw== X-Received: by 2002:a17:906:18b2:b0:6d0:ee54:1add with SMTP id c18-20020a17090618b200b006d0ee541addmr24364498ejf.499.1646249134294; Wed, 02 Mar 2022 11:25:34 -0800 (PST) Received: from localhost.localdomain (xdsl-188-155-181-108.adslplus.ch. [188.155.181.108]) by smtp.gmail.com with ESMTPSA id i14-20020a50cfce000000b00415b0730921sm1482765edk.42.2022.03.02.11.25.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Mar 2022 11:25:33 -0800 (PST) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH v2 5/6] nfc: llcp: protect nfc_llcp_sock_unlink() calls Date: Wed, 2 Mar 2022 20:25:22 +0100 Message-Id: <20220302192523.57444-6-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220302192523.57444-1-krzysztof.kozlowski@canonical.com> References: <20220302192523.57444-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" nfc_llcp_sock_link() is called in all paths (bind/connect) as a last action, still protected with lock_sock(). When cleaning up in llcp_sock_release(), call nfc_llcp_sock_unlink() in a mirrored way: earlier and still under the lock_sock(). Signed-off-by: Krzysztof Kozlowski --- net/nfc/llcp_sock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c index c9d5c427f035..5c5705f5028b 100644 --- a/net/nfc/llcp_sock.c +++ b/net/nfc/llcp_sock.c @@ -631,6 +631,11 @@ static int llcp_sock_release(struct socket *sock) } } =20 + if (sock->type =3D=3D SOCK_RAW) + nfc_llcp_sock_unlink(&local->raw_sockets, sk); + else + nfc_llcp_sock_unlink(&local->sockets, sk); + if (llcp_sock->reserved_ssap < LLCP_SAP_MAX) nfc_llcp_put_ssap(llcp_sock->local, llcp_sock->ssap); =20 @@ -643,11 +648,6 @@ static int llcp_sock_release(struct socket *sock) if (sk->sk_state =3D=3D LLCP_DISCONNECTING) return err; =20 - if (sock->type =3D=3D SOCK_RAW) - nfc_llcp_sock_unlink(&local->raw_sockets, sk); - else - nfc_llcp_sock_unlink(&local->sockets, sk); - out: sock_orphan(sk); sock_put(sk); --=20 2.32.0 From nobody Tue Jun 23 16:17:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19949C433F5 for ; Wed, 2 Mar 2022 19:26:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241488AbiCBT0s (ORCPT ); Wed, 2 Mar 2022 14:26:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240510AbiCBT0c (ORCPT ); Wed, 2 Mar 2022 14:26:32 -0500 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6B6BC1176 for ; Wed, 2 Mar 2022 11:25:37 -0800 (PST) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 97B7C3F5F7 for ; Wed, 2 Mar 2022 19:25:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646249136; bh=Mdsn7AT474MZc2MQVfRJDSMS8EOfClYXR9EYCiW/6uw=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AUCDt5MsPe1PsjaSbSqC0wKPst/OHiR1mFTDwZknPsfCfDn916ACo+WiDg3LUbhvx dZd6/Pg+5i6ioIBg2Vmo0iSut117ANG+Bx5udlxo1Fw0w6W1mjq62wmXsYBLrTKZsD z0eNI7a/NpueBLdcZpxghkvOAZWXkVAFUIG1F6hQMpGwMl3lyjNRgAVQJHk7/AHJnj MOQGDbQZerf8yq2Zn55yQs0ZlhSFSBNHer/c9hTx7546G5clYCgRqQvb3O+8Q9xAzP sE1fNHrkqFBVneq139nTcS3cBXLdX7/8fviz3fsarIn9NQf7MA2I8k7b1hcH9fnw9/ IIWibeZL7mW+w== Received: by mail-ed1-f71.google.com with SMTP id y13-20020aa7c24d000000b00411925b7829so1515501edo.22 for ; Wed, 02 Mar 2022 11:25:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Mdsn7AT474MZc2MQVfRJDSMS8EOfClYXR9EYCiW/6uw=; b=uE3whwocbk9MuPnKwHVfu6jabzRz4r8L2D20Y8fueTncnomIImAPB8jX17c9EDRJ8c euPtk8Zu/aegsrh6b/p+WRLiPXojkBJ50X2xI7+zTJbMgeT1SChHbVMKBRZijVB6D8wb DNizFGuJtQmsUe/FlbnWnNw3LtlcH489lODCj1D0f2zG40L0+lKGAzcMQOLv7fjV5ntd mKR/I7s+rDshx2w+mgTd+j0eZ2YFv817H/dQnDBwaSxW6G4W1XHPcb8CKYHLaAMDBgR1 YQivhOXMSVvXRlE3XSL4rVGbcifmUuZTmEKRiwaar0Ega4OriWTZ04CKCXDfX3vMb4F4 quEg== X-Gm-Message-State: AOAM533wxRL4kO57nObbHB6I72jUofaEu8fTkTckA1sHeLcFEbU911im AWB4D/6KpKu43alSqHDOUSeGd0Q0YkqNh8OjxX6Ee4tBwwgyUOW/DJQ+xOuRO5GAjTaC5SfoS7q 8CY3iKoRcjCn+17+ZWeiVYt/2I8mT7gG6fYb312U7Ow== X-Received: by 2002:a17:906:714c:b0:6cf:4850:52cc with SMTP id z12-20020a170906714c00b006cf485052ccmr24550325ejj.319.1646249136077; Wed, 02 Mar 2022 11:25:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJzTh8qQiPVslsguc9Q0e99iiJ94AmhFY0BNCMiQLPiKFvI8B9dasw3D154XCQaRCiddESFGrA== X-Received: by 2002:a17:906:714c:b0:6cf:4850:52cc with SMTP id z12-20020a170906714c00b006cf485052ccmr24550313ejj.319.1646249135910; Wed, 02 Mar 2022 11:25:35 -0800 (PST) Received: from localhost.localdomain (xdsl-188-155-181-108.adslplus.ch. [188.155.181.108]) by smtp.gmail.com with ESMTPSA id i14-20020a50cfce000000b00415b0730921sm1482765edk.42.2022.03.02.11.25.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Mar 2022 11:25:34 -0800 (PST) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , "David S. Miller" , Jakub Kicinski , linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH v2 6/6] nfc: llcp: Revert "NFC: Keep socket alive until the DISC PDU is actually sent" Date: Wed, 2 Mar 2022 20:25:23 +0100 Message-Id: <20220302192523.57444-7-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220302192523.57444-1-krzysztof.kozlowski@canonical.com> References: <20220302192523.57444-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This reverts commit 17f7ae16aef1f58bc4af4c7a16b8778a91a30255. The commit brought a new socket state LLCP_DISCONNECTING, which was never set, only read, so socket could never set to such state. Remove the dead code. Signed-off-by: Krzysztof Kozlowski --- net/nfc/llcp.h | 1 - net/nfc/llcp_core.c | 7 ------- net/nfc/llcp_sock.c | 7 ------- 3 files changed, 15 deletions(-) diff --git a/net/nfc/llcp.h b/net/nfc/llcp.h index d49d4bf2e37c..c1d9be636933 100644 --- a/net/nfc/llcp.h +++ b/net/nfc/llcp.h @@ -6,7 +6,6 @@ enum llcp_state { LLCP_CONNECTED =3D 1, /* wait_for_packet() wants that */ LLCP_CONNECTING, - LLCP_DISCONNECTING, LLCP_CLOSED, LLCP_BOUND, LLCP_LISTEN, diff --git a/net/nfc/llcp_core.c b/net/nfc/llcp_core.c index b70d5042bf74..3364caabef8b 100644 --- a/net/nfc/llcp_core.c +++ b/net/nfc/llcp_core.c @@ -737,13 +737,6 @@ static void nfc_llcp_tx_work(struct work_struct *work) print_hex_dump_debug("LLCP Tx: ", DUMP_PREFIX_OFFSET, 16, 1, skb->data, skb->len, true); =20 - if (ptype =3D=3D LLCP_PDU_DISC && sk !=3D NULL && - sk->sk_state =3D=3D LLCP_DISCONNECTING) { - nfc_llcp_sock_unlink(&local->sockets, sk); - sock_orphan(sk); - sock_put(sk); - } - if (ptype =3D=3D LLCP_PDU_I) copy_skb =3D skb_copy(skb, GFP_ATOMIC); =20 diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c index 5c5705f5028b..4ca35791c93b 100644 --- a/net/nfc/llcp_sock.c +++ b/net/nfc/llcp_sock.c @@ -641,13 +641,6 @@ static int llcp_sock_release(struct socket *sock) =20 release_sock(sk); =20 - /* Keep this sock alive and therefore do not remove it from the sockets - * list until the DISC PDU has been actually sent. Otherwise we would - * reply with DM PDUs before sending the DISC one. - */ - if (sk->sk_state =3D=3D LLCP_DISCONNECTING) - return err; - out: sock_orphan(sk); sock_put(sk); --=20 2.32.0