Commit 7bcc6738 authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller

ISDN: pcbit: off by one bugs in pcbit_set_msn()

1) We don't allocate enough space for the NUL terminator so we end up
   corrupting one character beyond the end of the buffer.

2) The "len - 1" should just be "len".  The code is trying to copy a
   word from a buffer up to a comma or the last word in the buffer.
   Say you have the buffer, "foo,bar,baz", then this code truncates the
   last letter off each word so you get "fo", "ba", and "ba".  You would
   hope this kind of bug would get noticed in testing...

   I'm not very familiar with this code and I can't test it, but I think
   we should copy the final character.
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e98d69ba
...@@ -1035,14 +1035,14 @@ static void pcbit_set_msn(struct pcbit_dev *dev, char *list) ...@@ -1035,14 +1035,14 @@ static void pcbit_set_msn(struct pcbit_dev *dev, char *list)
} }
ptr->next = NULL; ptr->next = NULL;
ptr->msn = kmalloc(len, GFP_ATOMIC); ptr->msn = kmalloc(len + 1, GFP_ATOMIC);
if (!ptr->msn) { if (!ptr->msn) {
printk(KERN_WARNING "kmalloc failed\n"); printk(KERN_WARNING "kmalloc failed\n");
kfree(ptr); kfree(ptr);
return; return;
} }
memcpy(ptr->msn, sp, len - 1); memcpy(ptr->msn, sp, len);
ptr->msn[len] = 0; ptr->msn[len] = 0;
#ifdef DEBUG #ifdef DEBUG
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment