Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967756Ab3HICOc (ORCPT ); Thu, 8 Aug 2013 22:14:32 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:55727 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967588Ab3HIB66 (ORCPT ); Thu, 8 Aug 2013 21:58:58 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jaganath Kanakkassery , Chan-Yeol Park , Johan Hedberg , Gustavo Padovan Subject: [ 045/102] Bluetooth: Fix invalid length check in l2cap_information_rsp() Date: Thu, 8 Aug 2013 18:57:21 -0700 Message-Id: <20130809015020.460694273@linuxfoundation.org> X-Mailer: git-send-email 1.8.3.rc0.20.gb99dd2e In-Reply-To: <20130809015010.208118575@linuxfoundation.org> References: <20130809015010.208118575@linuxfoundation.org> User-Agent: quilt/0.60-5.1.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1730 Lines: 54 3.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jaganath Kanakkassery commit da9910ac4a816b4340944c78d94c02a35527db46 upstream. The length check is invalid since the length varies with type of info response. This was introduced by the commit cb3b3152b2f5939d67005cff841a1ca748b19888 Because of this, l2cap info rsp is not handled and command reject is sent. > ACL data: handle 11 flags 0x02 dlen 16 L2CAP(s): Info rsp: type 2 result 0 Extended feature mask 0x00b8 Enhanced Retransmission mode Streaming mode FCS Option Fixed Channels < ACL data: handle 11 flags 0x00 dlen 10 L2CAP(s): Command rej: reason 0 Command not understood Signed-off-by: Jaganath Kanakkassery Signed-off-by: Chan-Yeol Park Acked-by: Johan Hedberg Signed-off-by: Gustavo Padovan Signed-off-by: Greg Kroah-Hartman --- net/bluetooth/l2cap_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -4240,7 +4240,7 @@ static inline int l2cap_disconnect_rsp(s u16 dcid, scid; struct l2cap_chan *chan; - if (cmd_len != sizeof(*rsp)) + if (cmd_len < sizeof(*rsp)) return -EPROTO; scid = __le16_to_cpu(rsp->scid); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/