Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eafe1aa3 authored by Karsten Keil's avatar Karsten Keil Committed by Linus Torvalds
Browse files

I4L: fix isdn_ioctl memory overrun vulnerability 



Fix possible memory overrun issue in the isdn ioctl code.

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

Signed-off-by: default avatarKarsten Keil <kkeil@suse.de>
Cc: ADLAB <adlab@venustech.com.cn>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 92d499d9

drivers/isdn/i4l/isdn_common.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -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;