summaryrefslogtreecommitdiff
path: root/drivers/isdn/divert/divert_procfs.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-12-28 02:04:51 +0400
committerArnd Bergmann <arnd@arndb.de>2011-12-28 02:05:06 +0400
commit07b98403ee67838bbaded43bd687875b9d7f74e0 (patch)
tree0b1f155ae4628a2be4dc4dd4c7fbeeaf1d8016dc /drivers/isdn/divert/divert_procfs.c
parentb17471f5d121a53be1ccf6e0b0599441e56b468c (diff)
parentf4ebf1d1f8d10b703493e76300605e8be2f21bf5 (diff)
downloadlinux-07b98403ee67838bbaded43bd687875b9d7f74e0.tar.xz
Merge branch 'omap/hwmod' into next/drivers
This is needed as a dependency for omap/ehci. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/isdn/divert/divert_procfs.c')
-rw-r--r--drivers/isdn/divert/divert_procfs.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/isdn/divert/divert_procfs.c b/drivers/isdn/divert/divert_procfs.c
index 33ec9e467772..9021182c4b76 100644
--- a/drivers/isdn/divert/divert_procfs.c
+++ b/drivers/isdn/divert/divert_procfs.c
@@ -242,6 +242,12 @@ static int isdn_divert_ioctl_unlocked(struct file *file, uint cmd, ulong arg)
case IIOCDOCFINT:
if (!divert_if.drv_to_name(dioctl.cf_ctrl.drvid))
return (-EINVAL); /* invalid driver */
+ if (strnlen(dioctl.cf_ctrl.msn, sizeof(dioctl.cf_ctrl.msn)) ==
+ sizeof(dioctl.cf_ctrl.msn))
+ return -EINVAL;
+ if (strnlen(dioctl.cf_ctrl.fwd_nr, sizeof(dioctl.cf_ctrl.fwd_nr)) ==
+ sizeof(dioctl.cf_ctrl.fwd_nr))
+ return -EINVAL;
if ((i = cf_command(dioctl.cf_ctrl.drvid,
(cmd == IIOCDOCFACT) ? 1 : (cmd == IIOCDOCFDIS) ? 0 : 2,
dioctl.cf_ctrl.cfproc,