From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758220AbZLFXjG (ORCPT ); Sun, 6 Dec 2009 18:39:06 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758186AbZLFXi6 (ORCPT ); Sun, 6 Dec 2009 18:38:58 -0500 Received: from kroah.org ([198.145.64.141]:33824 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758155AbZLFXit (ORCPT ); Sun, 6 Dec 2009 18:38:49 -0500 X-Mailbox-Line: From gregkh@mini.kroah.org Sun Dec 6 15:32:10 2009 Message-Id: <20091206233210.240780761@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Sun, 06 Dec 2009 15:30:46 -0800 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Roel Kluin , Karsten Keil , "David S. Miller" Subject: [14/20] isdn: hfc_usb: Fix read buffer overflow References: <20091206233032.387950574@mini.kroah.org> Content-Disposition: inline; filename=isdn-hfc_usb-fix-read-buffer-overflow.patch In-Reply-To: <20091206233711.GA11609@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.27-stable review patch. If anyone has any objections, please let us know. ------------------ From: Roel Kluin commit 286e633ef0ff5bb63c07b4516665da8004966fec upstream. Check whether index is within bounds before testing the element. Signed-off-by: Roel Kluin Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/isdn/hisax/hfc_usb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/isdn/hisax/hfc_usb.c +++ b/drivers/isdn/hisax/hfc_usb.c @@ -818,8 +818,8 @@ collect_rx_frame(usb_fifo * fifo, __u8 * } /* we have a complete hdlc packet */ if (finish) { - if ((!fifo->skbuff->data[fifo->skbuff->len - 1]) - && (fifo->skbuff->len > 3)) { + if (fifo->skbuff->len > 3 && + !fifo->skbuff->data[fifo->skbuff->len - 1]) { if (fifon == HFCUSB_D_RX) { DBG(HFCUSB_DBG_DCHANNEL,