Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 15:29:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

I4L: fix isdn_ioctl memory overrun vulnerability

Browse Source 
Fix possible memory overrun issue in the isdn ioctl code.

Found by ADLAB <adlab@venustech.com.cn>

Signed-off-by: Karsten Keil <kkeil@suse.de>
Cc: ADLAB <adlab@venustech.com.cn>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Karsten Keil 2007-12-01 12:16:15 -08:00 committed by Linus Torvalds
parent 92d499d991
commit eafe1aa37e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/isdn/i4l/isdn_common.c
View File

@ -1515,6 +1515,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
if (copy_from_user(&iocts, argp, if (copy_from_user(&iocts, argp,
sizeof(isdn_ioctl_struct))) sizeof(isdn_ioctl_struct)))
return -EFAULT; return -EFAULT;
iocts.drvid[sizeof(iocts.drvid)-1] = 0;
if (strlen(iocts.drvid)) { if (strlen(iocts.drvid)) {
if ((p = strchr(iocts.drvid, ','))) if ((p = strchr(iocts.drvid, ',')))
*p = 0; *p = 0;
@ -1599,6 +1600,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
if (copy_from_user(&iocts, argp, if (copy_from_user(&iocts, argp,
sizeof(isdn_ioctl_struct))) sizeof(isdn_ioctl_struct)))
return -EFAULT; return -EFAULT;
iocts.drvid[sizeof(iocts.drvid)-1] = 0;
if (strlen(iocts.drvid)) { if (strlen(iocts.drvid)) {
drvidx = -1; drvidx = -1;
for (i = 0; i < ISDN_MAX_DRIVERS; i++) for (i = 0; i < ISDN_MAX_DRIVERS; i++)
@ -1643,7 +1645,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
} else { } else {
p = (char __user *) iocts.arg; p = (char __user *) iocts.arg;
for (i = 0; i < 10; i++) { for (i = 0; i < 10; i++) {
sprintf(bname, "%s%s", snprintf(bname, sizeof(bname), "%s%s",
strlen(dev->drv[drvidx]->msn2eaz[i]) ? strlen(dev->drv[drvidx]->msn2eaz[i]) ?
dev->drv[drvidx]->msn2eaz[i] : "_", dev->drv[drvidx]->msn2eaz[i] : "_",
(i < 9) ? "," : "\0"); (i < 9) ? "," : "\0");
@ -1673,6 +1675,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
char *p; char *p;
if (copy_from_user(&iocts, argp, sizeof(isdn_ioctl_struct))) if (copy_from_user(&iocts, argp, sizeof(isdn_ioctl_struct)))
return -EFAULT; return -EFAULT;
iocts.drvid[sizeof(iocts.drvid)-1] = 0;
if (strlen(iocts.drvid)) { if (strlen(iocts.drvid)) {
if ((p = strchr(iocts.drvid, ','))) if ((p = strchr(iocts.drvid, ',')))
*p = 0; *p = 0;