From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 965E8C18E5A for ; Wed, 11 Mar 2020 14:51:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2CB0F20737 for ; Wed, 11 Mar 2020 14:50:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729934AbgCKOu7 convert rfc822-to-8bit (ORCPT ); Wed, 11 Mar 2020 10:50:59 -0400 Received: from coyote.holtmann.net ([212.227.132.17]:56256 "EHLO mail.holtmann.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729844AbgCKOu7 (ORCPT ); Wed, 11 Mar 2020 10:50:59 -0400 Received: from [172.20.10.2] (x59cc8a78.dyn.telefonica.de [89.204.138.120]) by mail.holtmann.org (Postfix) with ESMTPSA id 7DF0DCECDF; Wed, 11 Mar 2020 16:00:25 +0100 (CET) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.0 \(3608.60.0.2.5\)) Subject: Re: [Bluez PATCH v1] Bluetooth: L2CAP: handle l2cap config request during open state From: Marcel Holtmann In-Reply-To: <20200310180642.Bluez.v1.1.I50b301a0464eb68e3d62721bf59e11ed2617c415@changeid> Date: Wed, 11 Mar 2020 15:50:56 +0100 Cc: Bluez mailing list , ChromeOS Bluetooth Upstreaming , "David S. Miller" , Johan Hedberg , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Jakub Kicinski Content-Transfer-Encoding: 8BIT Message-Id: References: <20200310180642.Bluez.v1.1.I50b301a0464eb68e3d62721bf59e11ed2617c415@changeid> To: Howard Chung X-Mailer: Apple Mail (2.3608.60.0.2.5) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Howard, > According to Core Spec Version 5.2 | Vol 3, Part A 6.1.5, > the incoming L2CAP_ConfigReq should be handled during > OPEN state. > > Signed-off-by: Howard Chung > > --- > > net/bluetooth/l2cap_core.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c > index 697c0f7f2c1a..5e6e35ab44dd 100644 > --- a/net/bluetooth/l2cap_core.c > +++ b/net/bluetooth/l2cap_core.c > @@ -4300,7 +4300,8 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, > return 0; > } > > - if (chan->state != BT_CONFIG && chan->state != BT_CONNECT2) { > + if (chan->state != BT_CONFIG && chan->state != BT_CONNECT2 && > + chan->state != BT_CONNECTED) { > cmd_reject_invalid_cid(conn, cmd->ident, chan->scid, > chan->dcid); > goto unlock; Any chance you can add a btmon trace excerpt for this to the commit message. It would be good to have the before and after here included. Regards Marcel From mboxrd@z Thu Jan 1 00:00:00 1970 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=-4.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,RDNS_NONE,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_NONE autolearn=no autolearn_force=no version=3.4.0 Received: from coyote.holtmann.net ([212.227.132.17]:56256 "EHLO mail.holtmann.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729844AbgCKOu7 (ORCPT ); Wed, 11 Mar 2020 10:50:59 -0400 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.0 \(3608.60.0.2.5\)) Subject: Re: [Bluez PATCH v1] Bluetooth: L2CAP: handle l2cap config request during open state From: Marcel Holtmann In-Reply-To: <20200310180642.Bluez.v1.1.I50b301a0464eb68e3d62721bf59e11ed2617c415@changeid> Date: Wed, 11 Mar 2020 15:50:56 +0100 Cc: Bluez mailing list , ChromeOS Bluetooth Upstreaming , "David S. Miller" , Johan Hedberg , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Jakub Kicinski Content-Transfer-Encoding: 8BIT Message-Id: References: <20200310180642.Bluez.v1.1.I50b301a0464eb68e3d62721bf59e11ed2617c415@changeid> To: Howard Chung Sender: linux-kernel-owner@vger.kernel.org List-ID: Message-ID: <20200311145056.QeJdSBlwij4hMjiftVdckGqcFO1AKzlSHPIIQD-lQMI@z> Hi Howard, > According to Core Spec Version 5.2 | Vol 3, Part A 6.1.5, > the incoming L2CAP_ConfigReq should be handled during > OPEN state. > > Signed-off-by: Howard Chung > > --- > > net/bluetooth/l2cap_core.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c > index 697c0f7f2c1a..5e6e35ab44dd 100644 > --- a/net/bluetooth/l2cap_core.c > +++ b/net/bluetooth/l2cap_core.c > @@ -4300,7 +4300,8 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, > return 0; > } > > - if (chan->state != BT_CONFIG && chan->state != BT_CONNECT2) { > + if (chan->state != BT_CONFIG && chan->state != BT_CONNECT2 && > + chan->state != BT_CONNECTED) { > cmd_reject_invalid_cid(conn, cmd->ident, chan->scid, > chan->dcid); > goto unlock; Any chance you can add a btmon trace excerpt for this to the commit message. It would be good to have the before and after here included. Regards Marcel