Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754802Ab0LHAeS (ORCPT ); Tue, 7 Dec 2010 19:34:18 -0500 Received: from kroah.org ([198.145.64.141]:54688 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754013Ab0LHAeQ (ORCPT ); Tue, 7 Dec 2010 19:34:16 -0500 X-Mailbox-Line: From gregkh@clark.site Tue Dec 7 16:06:39 2010 Message-Id: <20101208000639.826506614@clark.site> User-Agent: quilt/0.48-11.2 Date: Tue, 07 Dec 2010 16:04:02 -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, Samuel Ortiz Subject: [03/44] irda: Fix heap memory corruption in iriap.c In-Reply-To: <20101208003205.GA4286@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1194 Lines: 38 2.6.27-stable review patch. If anyone has any objections, please let us know. ------------------ From: Samuel Ortiz commit 37f9fc452d138dfc4da2ee1ce5ae85094efc3606 upstream. While parsing the GetValuebyClass command frame, we could potentially write passed the skb->data pointer. Reported-by: Ilja Van Sprundel Signed-off-by: Samuel Ortiz Signed-off-by: Greg Kroah-Hartman --- net/irda/iriap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/net/irda/iriap.c +++ b/net/irda/iriap.c @@ -501,7 +501,8 @@ static void iriap_getvaluebyclass_confir IRDA_DEBUG(4, "%s(), strlen=%d\n", __func__, value_len); /* Make sure the string is null-terminated */ - fp[n+value_len] = 0x00; + if (n + value_len < skb->len) + fp[n + value_len] = 0x00; IRDA_DEBUG(4, "Got string %s\n", fp+n); /* Will truncate to IAS_MAX_STRING bytes */ -- 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/