]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
irda: Fix heap memory corruption in iriap.c
authorSamuel Ortiz <samuel@sortiz.org>
Tue, 5 Oct 2010 23:03:12 +0000 (01:03 +0200)
committerSamuel Ortiz <sameo@linux.intel.com>
Mon, 11 Oct 2010 00:12:26 +0000 (02:12 +0200)
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>
net/irda/iriap.c

index fce364c6c71a5e612fb9f0c2c65b0166749821af..5b743bdd89ba26a3a30b1110de67cea27636f047 100644 (file)
@@ -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 */