Received: by 2002:a05:6358:701b:b0:131:369:b2a3 with SMTP id 27csp2551655rwo; Sun, 23 Jul 2023 18:46:03 -0700 (PDT) X-Google-Smtp-Source: APBJJlFJ+0tMb/M68eDmYxqskovU6oSvi/iSuSuKVFQhlmIlsSUYoeF6RU8IuOaipoziTCJ2Kldw X-Received: by 2002:a17:906:51de:b0:993:d97f:ae06 with SMTP id v30-20020a17090651de00b00993d97fae06mr9311687ejk.13.1690163163056; Sun, 23 Jul 2023 18:46:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690163163; cv=none; d=google.com; s=arc-20160816; b=uJhEo55YBsILPnW98EDMMjBcvGyPF38IGeYpZA/Z/8Pno3RKQ9pGMzu4V4vtdyhLy8 4NbTsigNnLSPTDCscktXhQ4hN9ltcm0wkZV/1pbnFT50BbPADHb13rAKqxAP45pQ8exS 0IRg4RZI93/dzMsO96MuHhnxt77dBZ06MSHmlPpN2CW5fWNZpM6JGWGU0S/MDr1GGYfG JwzZgeC1PmIBCmPHQRuyz0OsAqwoFy1ZMVwKV1QGAC847NG42gpvEMG0zHlBSpy97Q3B H8vQbYiAs0X9SFK4NpSmWQsODuKGMFtweUea/HnYTk9LbEq+NZ02LySp0zVEKXSUStur NFyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=nHFVn1Ri41cPvSjHyvPM2Fecv/Qtu8Uk5KTyym3fPgo=; fh=IswUqWfd3XemqkL1M8oQJbhO7Q4QE0ddUBeO6/0MN9M=; b=pkUoOGVGGo8DZVwzRUEHHWFbrX5JmcmzQPulYJ2ao4mxpnu9efotbd94Y8cJKp13Wj G8Dg3tbc0cMWfVsCzMqQXx+pFwvmf3pdaFi4+soUmTQHzRqVMZGBsDFt/X2fAXPzzbaj lmi1N9IskMeS7phY/64e2civfQmnzFwTwiN4Q8Vx+FlmPfOF2V5rD2BYd+/XFtr4A+et 09JPKTqA9isTVtssZvAYlMYX1TPwR0wjEXqPcDwH7EVobKFvdg4aLlzrkUsdl/Th3V35 54zF3Bpjyk3F4EtIkOWv+TmobMDv1FIN6iSZSLcvH0DM2aGQI3pC1OJ5wRCUW9GqoJ72 dlMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="JM/J+1LV"; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id pk6-20020a170906d7a600b009980fa69e46si5749486ejb.514.2023.07.23.18.45.39; Sun, 23 Jul 2023 18:46:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="JM/J+1LV"; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232428AbjGXBoo (ORCPT + 99 others); Sun, 23 Jul 2023 21:44:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232561AbjGXBn0 (ORCPT ); Sun, 23 Jul 2023 21:43:26 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B4442689; Sun, 23 Jul 2023 18:38:06 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C26286100C; Mon, 24 Jul 2023 01:33:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C730C433C7; Mon, 24 Jul 2023 01:33:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690162426; bh=2YoCrwXNn5L2KW+P/U6cPT1N9UXv0/k5KP4tTfnqIfg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JM/J+1LVpRaOrUdMGarC0ubqgpezVmR68QNrpgNWDEuutWst7j+8J+ZyYz3xw1cmo YDcSu5s8N3zOlK9WNjAW8ucU8Og6zwsyH4rsEpW1j6TotIOumM/bJP+hFaqKa2/IyW BuTf209Vyuu/yBJMby0mcMWZTSoTQhKWMNuywsHqdJMy6g4oRwpxBshycPcvbvckTC eRmIIJ40yOhWWuIvuts0yoNsT4ad3pu/F6p+qeEwn5XpF36H10AfhtDMiiiea+03YW 1QeGEe+Kr5xbpLcvFjBd/0VOcSW5Itk5+qmp9gXkLPXOvDcHKOuvC3yAfX+Buli1XA OPHsIkz6InnlA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhengping Jiang , Luiz Augusto von Dentz , Jakub Kicinski , Sasha Levin , marcel@holtmann.org, gustavo@padovan.org, johan.hedberg@gmail.com, davem@davemloft.net, linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 14/24] Bluetooth: L2CAP: Fix use-after-free Date: Sun, 23 Jul 2023 21:33:15 -0400 Message-Id: <20230724013325.2332084-14-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230724013325.2332084-1-sashal@kernel.org> References: <20230724013325.2332084-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.121 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Zhengping Jiang [ Upstream commit f752a0b334bb95fe9b42ecb511e0864e2768046f ] Fix potential use-after-free in l2cap_le_command_rej. Signed-off-by: Zhengping Jiang Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/bluetooth/l2cap_core.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 9dd54247029a8..0770286ecf0bc 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -6375,9 +6375,14 @@ static inline int l2cap_le_command_rej(struct l2cap_conn *conn, if (!chan) goto done; + chan = l2cap_chan_hold_unless_zero(chan); + if (!chan) + goto done; + l2cap_chan_lock(chan); l2cap_chan_del(chan, ECONNREFUSED); l2cap_chan_unlock(chan); + l2cap_chan_put(chan); done: mutex_unlock(&conn->chan_lock); -- 2.39.2