Received: by 2002:a05:6358:701b:b0:131:369:b2a3 with SMTP id 27csp2568916rwo; Sun, 23 Jul 2023 19:14:42 -0700 (PDT) X-Google-Smtp-Source: APBJJlEGLYJwd4H2Rne2I8eWC1LyiqH/QQ8psvqsJasCb3D/IXwkY5ERslC+E1+Jbgdfi8QU7u55 X-Received: by 2002:a17:906:73c5:b0:96f:e5af:ac5f with SMTP id n5-20020a17090673c500b0096fe5afac5fmr8131627ejl.47.1690164882469; Sun, 23 Jul 2023 19:14:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690164882; cv=none; d=google.com; s=arc-20160816; b=NZwuLRnK8zsbqOSirZxr8b7KA0l+zOJoWLUP86mZ3ECTvr1cGWgIMnT/6+/1ktu2m4 6naHmwnu1jISkld0+UuysV1WOYd+TU36MMoo1IOhQMj8t0Tl6YHLe/G8ciWcxdNb0uA4 K3f8qof8QrZf1W/1717a2OyL88XA9HJlUHF717RnQMyk5xP4TunkkUT4lV1Hmuc+IB3W ZIRHJ2hBwxFoupe5gC28eLIH9h3ifQMmpslOAebnXWSnxQiSD44dVRh/F3Er1THc0jjp UJI5H7JiZGxWML6zWX83pZUXfzJlEz+E0aMif5lHMDCt8dh1kNfB+8dBjmc/hP+rZ/BN yM5Q== 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=9VIIvW7qCqiBVj1jLXia6OkpHewlpyTGQ7q3YeYI85E=; fh=IswUqWfd3XemqkL1M8oQJbhO7Q4QE0ddUBeO6/0MN9M=; b=hOKNk2Pohm/D3Iw2A1cveq3i5BxHIqMgv5N/fNVXAh/8pesdfQSjMwFQ/oAXqKiF6P gNPWJNqqtRt0Jt6FiMoPYK/sl8LUNL5md38+xx3SicMUwJJRQ484OEKTrCNuCTOaUteG 4hCtAZ07xPC6zjxxw16uKR6Tv7xDAhKtwIBkdT+HtTbmxAfAGrZEN4sbNtilcB3pl49/ hbUNYrj5ZJtCtFaeIMZRrUiGxeCMZsTSrn/iyPaUemR+YFQUY8647cguAAeIXQqzO8wk dWxiAkQTR9iiA4bXwwJ2W+DHNYDYTqfbK9LnYEFqOLoJ4rYf0LcUsalybqG0D3wCybYz J2wA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="l0/IF8/B"; 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 i14-20020a170906850e00b0099265d36c8dsi6146123ejx.294.2023.07.23.19.14.09; Sun, 23 Jul 2023 19:14:42 -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="l0/IF8/B"; 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 S232809AbjGXBvT (ORCPT + 99 others); Sun, 23 Jul 2023 21:51:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230015AbjGXBvC (ORCPT ); Sun, 23 Jul 2023 21:51:02 -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 22F1D1994; Sun, 23 Jul 2023 18:42:16 -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 F251060FBB; Mon, 24 Jul 2023 01:37:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17DA6C433C9; Mon, 24 Jul 2023 01:37:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690162621; bh=rSjN3IcZbqFDf3fYlmZAU3hQZGUDuAwj/Ce5GEIWCXY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l0/IF8/BkXojGwD8oAcZMRCN0ttdMXANQoaVOY32jqIl/BBRLP+ZSWuBqjQ0rbHDl 4FM3U0O8RXEyWnC9xYPc7NKpnwCrnyI2d2czKz+Z2hJXZpoGo9lw0HsypLM3R4Ojcp J0YwsY+77rOOR6NeCY0/fs0Q4eNtIbwJeFeByrbErUydzpHne1C2TxEYJiHdy4T9/p 9JCCn3dywjT7BGpu/wHDChCFSLqQC+f6YtMWEIbnH1zmLqd4aEMsG/u+edIFVhNKa5 2L8eBCvu3Yx2oNLLinJ4s17HI5d0Eui6wFYpPFqE5MY3t5g+RyL3HejBCe04MQlwKm 8mdcE1D8mrS5w== 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 4.14 7/9] Bluetooth: L2CAP: Fix use-after-free Date: Sun, 23 Jul 2023 21:35:49 -0400 Message-Id: <20230724013554.2334965-7-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230724013554.2334965-1-sashal@kernel.org> References: <20230724013554.2334965-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 4.14.320 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 25d88b8cfae97..6bae68b5d439c 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -5705,9 +5705,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