From patchwork Wed May 19 17:52:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zubin Mithra X-Patchwork-Id: 443125 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51CEBC433ED for ; Wed, 19 May 2021 17:52:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2A2E7611BF for ; Wed, 19 May 2021 17:52:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229972AbhESRxf (ORCPT ); Wed, 19 May 2021 13:53:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229638AbhESRxf (ORCPT ); Wed, 19 May 2021 13:53:35 -0400 Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80508C06175F for ; Wed, 19 May 2021 10:52:15 -0700 (PDT) Received: by mail-pg1-x534.google.com with SMTP id q15so9980363pgg.12 for ; Wed, 19 May 2021 10:52:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wnCRSwEx9htYKBS/cDc9ReUAFzUaKLXqNcbYMxcziz0=; b=ezyAJZrfOJg+TSYPh03cZKl3hNUbYYXP0Efe7D2njvIEE682H9NPmpao+i7VUUOErZ 4+NOXZ7LA/papPGWWYBvaSa4qijQw/IN/1qu2WrsAI4zaeNVpO85FFiC9S/hMO7qPB4j /uDoz/X/JYD6oN3rZKky0j/zgU3S9irNHJByg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wnCRSwEx9htYKBS/cDc9ReUAFzUaKLXqNcbYMxcziz0=; b=MS2eWt81XThcRfrB/9mLoXdx7Ke2jvj4Ul2Clfs7XGsdi8wQjvnfq5XRARSNiSFgoS WeH9a5VEI0k8WagPNuHo9LqK8+rQt82Kbk+bgzuzSQmovmOaYO79NedqjMPULPLOZTDZ xR26XKkMl9Cu/MVHIGALvk4x/RKvQW2PyB1NerKqGi5/lhykq352wwMX+84G6Rv2dGiY 1AtD7fYvD4uOnS0KhrUAWSlpJsm7Te1f0aS9cjpF8QG/vgUaSSJV5f8xASA9wA/178Aa ZCcOBkV8/pj0bamHprrTKkbwfddGdnqwESrrvAQInLR0dBPJx0QgeaLVhtB22QPiGlLz jOHA== X-Gm-Message-State: AOAM531Jibf0X289vLPMLgy3isBp7Umt/7jfwZG+nzjNvnTUh5n+cb5J +uDAVmpLGCVx0IJ1dkt8Eq+Red+vDr0sCg== X-Google-Smtp-Source: ABdhPJx3zyHMKz0zyouWfzjF82OiNs3qbf2ZAhtODcpyD9V2P57KFaai/pLFGlRJT3ZV7Pwp25svJg== X-Received: by 2002:a63:2bd5:: with SMTP id r204mr305540pgr.426.1621446734624; Wed, 19 May 2021 10:52:14 -0700 (PDT) Received: from zsm-linux.mtv.corp.google.com ([2620:15c:202:201:ac3f:df42:ff1f:5f2a]) by smtp.googlemail.com with ESMTPSA id x23sm4763227pje.52.2021.05.19.10.52.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 10:52:14 -0700 (PDT) From: Zubin Mithra To: stable@vger.kernel.org Cc: zsm@google.com, zsm@chromium.org Subject: [v5.4.y] Bluetooth: L2CAP: Fix handling LE modes by L2CAP_OPTIONS Date: Wed, 19 May 2021 10:52:10 -0700 Message-Id: <20210519175210.596822-1-zsm@chromium.org> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Luiz Augusto von Dentz L2CAP_OPTIONS shall only be used with BR/EDR modes. Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Marcel Holtmann (cherry picked from commit b86b0b150fed840c376145383ef5105116c81b0c) Signed-off-by: Zubin Mithra --- * Syzkaller triggered a GPF with the following stacktrace: l2cap_chan_send+0xa6e/0x1c30 net/bluetooth/l2cap_core.c:2532 l2cap_sock_sendmsg+0x1da/0x1fd net/bluetooth/l2cap_sock.c:985 sock_sendmsg_nosec+0x88/0xb4 net/socket.c:638 sock_sendmsg+0x5e/0x6f net/socket.c:658 ____sys_sendmsg+0x45c/0x5a5 net/socket.c:2298 ___sys_sendmsg+0x13e/0x19f net/socket.c:2352 __sys_sendmmsg+0x298/0x38c net/socket.c:2455 __do_sys_sendmmsg net/socket.c:2484 [inline] __se_sys_sendmmsg net/socket.c:2481 [inline] __x64_sys_sendmmsg+0xad/0xb6 net/socket.c:2481 do_syscall_64+0x10b/0x144 arch/x86/entry/common.c:299 entry_SYSCALL_64_after_hwframe+0x49/0xbe * This commit is present in 5.10.y and newer. 4.19.y and older do not need this fix. * This patch resolves conflicts that arise due to a BT_DBG() introduced in the following commit not being present in linux-5.4.y: - 15f02b910562 ("Bluetooth: L2CAP: Add initial code for Enhanced Credit Based Mode") * Tests run: syzkaller reproducer, Chrome OS tryjobs net/bluetooth/l2cap_sock.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 8648c5211ebe..e43da778c993 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -418,6 +418,20 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname, break; } + /* Only BR/EDR modes are supported here */ + switch (chan->mode) { + case L2CAP_MODE_BASIC: + case L2CAP_MODE_ERTM: + case L2CAP_MODE_STREAMING: + break; + default: + err = -EINVAL; + break; + } + + if (err < 0) + break; + memset(&opts, 0, sizeof(opts)); opts.imtu = chan->imtu; opts.omtu = chan->omtu; @@ -677,10 +691,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, break; } - chan->mode = opts.mode; - switch (chan->mode) { - case L2CAP_MODE_LE_FLOWCTL: - break; + /* Only BR/EDR modes are supported here */ + switch (opts.mode) { case L2CAP_MODE_BASIC: clear_bit(CONF_STATE2_DEVICE, &chan->conf_state); break; @@ -694,6 +706,10 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, break; } + if (err < 0) + break; + + chan->mode = opts.mode; chan->imtu = opts.imtu; chan->omtu = opts.omtu; chan->fcs = opts.fcs;