[PATCH] [9/223] irda: Fix heap memory corruption in iriap.c

From: Andi Kleen
Date: Sun Dec 12 2010 - 19:28:35 EST


2.6.35-longterm review patch. If anyone has any objections, please let me know.

------------------
From: Samuel Ortiz <samuel@xxxxxxxxxx>

commit 37f9fc452d138dfc4da2ee1ce5ae85094efc3606 upstream.

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

Reported-by: Ilja Van Sprundel <ivansprundel@xxxxxxxxxxxx>
Signed-off-by: Samuel Ortiz <samuel@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>

---
net/irda/iriap.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Index: linux/net/irda/iriap.c
===================================================================
--- linux.orig/net/irda/iriap.c
+++ linux/net/irda/iriap.c
@@ -502,7 +502,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@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/