From: Samuel Ortiz <samuel@sortiz.org>
Date: Tue, 5 Oct 2010 23:03:12 +0000 (+0200)
Subject: irda: Fix heap memory corruption in iriap.c
X-Git-Tag: v2.6.34.9~189
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8e802130e66784de2f787f65210ae17a16aa2333;p=karo-tx-linux.git

irda: Fix heap memory corruption in iriap.c

commit 37f9fc452d138dfc4da2ee1ce5ae85094efc3606 upstream.

While parsing the GetValuebyClass command frame, we could potentially write
passed the skb->data pointer.

Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Samuel Ortiz <samuel@sortiz.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---

diff --git a/net/irda/iriap.c b/net/irda/iriap.c
index 79a1e5a23e10..b6fd6d19240a 100644
--- a/net/irda/iriap.c
+++ b/net/irda/iriap.c
@@ -502,7 +502,8 @@ static void iriap_getvaluebyclass_confirm(struct iriap_cb *self,
 		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 */