From patchwork Thu Jun 1 02:38:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ying Hsu X-Patchwork-Id: 13262904 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2DC341108 for ; Thu, 1 Jun 2023 02:38:50 +0000 (UTC) Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82174126 for ; Wed, 31 May 2023 19:38:49 -0700 (PDT) Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-1b0201d9a9eso3363125ad.0 for ; Wed, 31 May 2023 19:38:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1685587129; x=1688179129; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Z6KIM/eqZlqxDnAEf4Mp5EKP1N4QltATian8TLmbDPw=; b=QFOUGOMhQNwiEvDUUlqmUAxS5rJPqYOvrxlHt3okDtgmyvL9g13tIhEJy6Xd4SoVYK eBieMkGDWEBagm0kGDwTd5rMj00cOQmKAhtbEyH3BUzhINyisq8uTEt0l3fNusLypewT FlVX7c3aUWbz/zAwlfYWNLWNqS7nQX7hSYwXM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685587129; x=1688179129; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Z6KIM/eqZlqxDnAEf4Mp5EKP1N4QltATian8TLmbDPw=; b=K4tsVYQ+AOUTAi9AxcVvd08g0h67dXrgSmD99Vo+ZlU9nVhMm4MDnNOt/hvvhd5Rp7 7r0WhlLCKhrF8C+kivKIDsjlIzself5TJ2aqxb393erciE1tiCo6OlQkVWVv/wBYMy8a 6NYPY1kkSxtrMZHXNh0iAg/f9MmymV4i9x1d0rwXLDp2QavbWczeMnYMY6v49bKYlgqB WzmEvXN89wUXXtxvTcqCpxytoOrzO5TQZGGFjd4VxczbmTOJAEFBGWjJ0lgbINLaVx+F K7HWGxIBOiuoA/O5IXdutnlEsQgB/b9f9CaELjiL+aBbRi7gRva+Tq0on2do8ppmKqop Y6lQ== X-Gm-Message-State: AC+VfDw2YIUhjKvgST1z/ytVNhhGHwoC9m1RLjVDzLIOSykkvoijC2dZ LM4fPi7c5674O9+PT+BAi+08ZA== X-Google-Smtp-Source: ACHHUZ7gEL/GDu54KRGyiFnNCOXWK0l1/ZD+qeeR62f9kjeI0xeyE64fZ86A6WtyKKcaQ1LmcRcmiQ== X-Received: by 2002:a17:902:c94f:b0:1af:b5af:367b with SMTP id i15-20020a170902c94f00b001afb5af367bmr469370pla.29.1685587128958; Wed, 31 May 2023 19:38:48 -0700 (PDT) Received: from localhost (21.160.199.104.bc.googleusercontent.com. [104.199.160.21]) by smtp.gmail.com with UTF8SMTPSA id z6-20020a170902708600b001a04d27ee92sm2077752plk.241.2023.05.31.19.38.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 31 May 2023 19:38:48 -0700 (PDT) From: Ying Hsu To: linux-bluetooth@vger.kernel.org Cc: chromeos-bluetooth-upstreaming@chromium.org, Ying Hsu , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Johan Hedberg , Luiz Augusto von Dentz , Marcel Holtmann , Min Li , Paolo Abeni , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v6] Bluetooth: Fix l2cap_disconnect_req deadlock Date: Thu, 1 Jun 2023 02:38:32 +0000 Message-ID: <20230601023835.1117866-1-yinghsu@chromium.org> X-Mailer: git-send-email 2.41.0.rc0.172.g3f132b7071-goog Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org L2CAP assumes that the locks conn->chan_lock and chan->lock are acquired in the order conn->chan_lock, chan->lock to avoid potential deadlock. For example, l2sock_shutdown acquires these locks in the order: mutex_lock(&conn->chan_lock) l2cap_chan_lock(chan) However, l2cap_disconnect_req acquires chan->lock in l2cap_get_chan_by_scid first and then acquires conn->chan_lock before calling l2cap_chan_del. This means that these locks are acquired in unexpected order, which leads to potential deadlock: l2cap_chan_lock(c) mutex_lock(&conn->chan_lock) This patch releases chan->lock before acquiring the conn_chan_lock to avoid the potential deadlock. Fixes: a2a9339e1c9d ("Bluetooth: L2CAP: Fix use-after-free in l2cap_disconnect_{req,rsp}") Signed-off-by: Ying Hsu --- This commit has been tested on a Chromebook device. Changes in v6: - Fixing format of the fixes tag. Changes in v5: - Fixing the merge conflict by removing l2cap_del_chan_by_scid. Changes in v4: - Using l2cap_get_chan_by_scid to avoid repeated code. - Releasing chan->lock before acquiring conn->chan_lock. Changes in v3: - Adding the fixes tag. Changes in v2: - Adding the prefix "Bluetooth:" to subject line. net/bluetooth/l2cap_core.c | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 036bc147f4de..16ac4aac0638 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -4634,26 +4634,6 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, return err; } -static struct l2cap_chan *l2cap_del_chan_by_scid(struct l2cap_conn *conn, - u16 cid, int err) -{ - struct l2cap_chan *c; - - mutex_lock(&conn->chan_lock); - c = __l2cap_get_chan_by_scid(conn, cid); - if (c) { - /* Only lock if chan reference is not 0 */ - c = l2cap_chan_hold_unless_zero(c); - if (c) { - l2cap_chan_lock(c); - l2cap_chan_del(c, err); - } - } - mutex_unlock(&conn->chan_lock); - - return c; -} - static inline int l2cap_disconnect_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr *cmd, u16 cmd_len, u8 *data) @@ -4671,7 +4651,7 @@ static inline int l2cap_disconnect_req(struct l2cap_conn *conn, BT_DBG("scid 0x%4.4x dcid 0x%4.4x", scid, dcid); - chan = l2cap_del_chan_by_scid(conn, dcid, ECONNRESET); + chan = l2cap_get_chan_by_scid(conn, dcid); if (!chan) { cmd_reject_invalid_cid(conn, cmd->ident, dcid, scid); return 0; @@ -4682,6 +4662,13 @@ static inline int l2cap_disconnect_req(struct l2cap_conn *conn, l2cap_send_cmd(conn, cmd->ident, L2CAP_DISCONN_RSP, sizeof(rsp), &rsp); chan->ops->set_shutdown(chan); + + l2cap_chan_unlock(chan); + mutex_lock(&conn->chan_lock); + l2cap_chan_lock(chan); + l2cap_chan_del(chan, ECONNRESET); + mutex_unlock(&conn->chan_lock); + chan->ops->close(chan); l2cap_chan_unlock(chan); @@ -4706,7 +4693,7 @@ static inline int l2cap_disconnect_rsp(struct l2cap_conn *conn, BT_DBG("dcid 0x%4.4x scid 0x%4.4x", dcid, scid); - chan = l2cap_del_chan_by_scid(conn, scid, 0); + chan = l2cap_get_chan_by_scid(conn, scid); if (!chan) return 0; @@ -4716,6 +4703,12 @@ static inline int l2cap_disconnect_rsp(struct l2cap_conn *conn, return 0; } + l2cap_chan_unlock(chan); + mutex_lock(&conn->chan_lock); + l2cap_chan_lock(chan); + l2cap_chan_del(chan, 0); + mutex_unlock(&conn->chan_lock); + chan->ops->close(chan); l2cap_chan_unlock(chan);