Received: by 2002:a05:6358:701b:b0:131:369:b2a3 with SMTP id 27csp2549183rwo; Sun, 23 Jul 2023 18:41:23 -0700 (PDT) X-Google-Smtp-Source: APBJJlHr+KuVi2PvBRXOkVagATi9YMeG8RxYOUJ63jZrxUxxYGb0KBgbt4Dv7KQt+J+sKorx37hu X-Received: by 2002:a50:ec97:0:b0:521:d84b:d86a with SMTP id e23-20020a50ec97000000b00521d84bd86amr6843809edr.41.1690162883484; Sun, 23 Jul 2023 18:41:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690162883; cv=none; d=google.com; s=arc-20160816; b=vk2lXSwz2zPXdRshX1DKYGZ/wUU2y4Tv7TEVJpmUZbgu0ZIwVSNQaPBNj8SJ2wh2X/ w+/CFrGwYytgQ0JB5doRUzyCZumS/OcdXT2liu6DyCzxvKHqFkmFTt05CDRlnrxpE40O ztuOGoufJMOT1gfGOBI5pw6QfS3MS/jlfiT7jzO9ub+2selDW5VtjlFJLztBp5hWo0tX mRy91YUUQsl1zktzojFStQ177qJt3KxaKtyb2mKIfjvrLNg5OcEH3l1DpaDFujCm6G7R 9pZT+4wpTjfLbvnnlG3yuEljk0j5PsfvWvjWgn1pt6GaxflEX7W2hHZCn/5JZAAC4Nad p/4w== 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=t7T1B24qNm3KvD8bo6vYG2ADI556M8qOWmk9C0R0W3k=; fh=IswUqWfd3XemqkL1M8oQJbhO7Q4QE0ddUBeO6/0MN9M=; b=SFvobsT92zKehL0Ga7a2L5HOW229ANEK1KMeA92juq4LPDgBautu2l8kb+cmtLL7r2 9evSXdCy8VhTyISDpiEXgVH3yXx0UvVFwuJgPFYAlfmrKGyQ1ZPRo+jIdoswGiM+an5f Vc7s+z6Qt7SvxwA+PuW1HtvAWGERWpXCrieaMy/3ZXYG3iJ56+SZBAPYUgXR3dBciP5S 65STVRSrd+HTD4dOxL6FCjHVyPITNq+VQtt64vDr8NP450WHaUkKwzYcKMY0Eg2LF0DA Wgz+Ye16mCb+QdVy58+fSD+JcYNMgbSSriNW5r2A6KpHxcjeDPbMj0wMxfxfQTb4B7Cy Ji5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hwPBp819; 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 b7-20020aa7c6c7000000b0052238cd36d7si29138eds.144.2023.07.23.18.40.49; Sun, 23 Jul 2023 18:41:23 -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=hwPBp819; 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 S231877AbjGXBiU (ORCPT + 99 others); Sun, 23 Jul 2023 21:38:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232023AbjGXBh6 (ORCPT ); Sun, 23 Jul 2023 21:37:58 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5319F3A86; Sun, 23 Jul 2023 18:33:54 -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 BA66760F1A; Mon, 24 Jul 2023 01:32:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ECB8DC433D9; Mon, 24 Jul 2023 01:32:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690162330; bh=VWn7I8aeOGGxbqba3PmdYM9O7ZKxNndmWAI4lNJd0nM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hwPBp819TecWumj6uZkymau1WW2ikZymIXJzT4mvo3ofHWIk+UoJY9SkZDFNawKuA QijjltEbGmz0VVQVoW2LVz+rRyKLs5xzappYu0LRTldhIRa0UldzELDFLPYUhacs0Y DLCEVWhWNZWn9Wb4CqK6dVxymUZJe0M6YStrn3EjDzQaeS7EigQqJJuJvgdrOfguLU EIBtPTadQDDQQRk84b4ghxPtlFR4icoUJHmXImvVNneMiJ5mCB3uUi3CRRDyEdvCE9 IG9X9V2Pp65qig15MrwM9As2xD310E47pgKyqsDcwk0Fufo0JIFJYRLSF/8fhiZDK0 4WCefD41aFAGg== 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 6.4 21/40] Bluetooth: L2CAP: Fix use-after-free Date: Sun, 23 Jul 2023 21:31:21 -0400 Message-Id: <20230724013140.2327815-21-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230724013140.2327815-1-sashal@kernel.org> References: <20230724013140.2327815-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.4.5 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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 c5e8798e297ca..17ca13e8c044c 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -6374,9 +6374,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