summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Ortiz <samuel@sortiz.org>2010-10-06 01:03:12 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-09 13:24:15 -0800
commit7d4ffa17797e86b7a17cc3fb26ab37cef6d00205 (patch)
treea2e2bf9bc74e0456793374fdaa888af698c6642d
parenta1b9505e4a663cdb5bc522b9dfa5ac1d1528bae2 (diff)
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: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--net/irda/iriap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/irda/iriap.c b/net/irda/iriap.c
index 4a105dc32dcd..1c339947f233 100644
--- a/net/irda/iriap.c
+++ b/net/irda/iriap.c
@@ -501,7 +501,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 */