summaryrefslogtreecommitdiffstats
path: root/net/irda
diff options
context:
space:
mode:
authorSamuel Ortiz <samuel@sortiz.org>2010-10-06 01:03:12 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2010-10-11 02:12:26 +0200
commit37f9fc452d138dfc4da2ee1ce5ae85094efc3606 (patch)
treef2c35efb2269f237efe69f6a1ef5986f784465c5 /net/irda
parentefc463eb508798da4243625b08c7396462cabf9f (diff)
downloadop-kernel-dev-37f9fc452d138dfc4da2ee1ce5ae85094efc3606.zip
op-kernel-dev-37f9fc452d138dfc4da2ee1ce5ae85094efc3606.tar.gz
irda: Fix heap memory corruption in iriap.c
While parsing the GetValuebyClass command frame, we could potentially write passed the skb->data pointer. Cc: stable@kernel.org Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> Signed-off-by: Samuel Ortiz <samuel@sortiz.org>
Diffstat (limited to 'net/irda')
-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 fce364c..5b743bd 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 */
OpenPOWER on IntegriCloud