aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>2014-04-02 12:48:42 +0900
committerBen Hutchings <ben@decadent.org.uk>2014-04-30 16:23:17 +0100
commitb6de0f964e567b8494c0172be16f2893452892df (patch)
tree6ee22b1d1bd9553231a3300be9d81c08be9e046f /drivers/isdn
parente78fe1b486df8633ee3e86573242eff51aa50007 (diff)
downloadkernel_samsung_smdk4412-b6de0f964e567b8494c0172be16f2893452892df.zip
kernel_samsung_smdk4412-b6de0f964e567b8494c0172be16f2893452892df.tar.gz
kernel_samsung_smdk4412-b6de0f964e567b8494c0172be16f2893452892df.tar.bz2
isdnloop: Validate NUL-terminated strings from user.
[ Upstream commit 77bc6bed7121936bb2e019a8c336075f4c8eef62 ] Return -EINVAL unless all of user-given strings are correctly NUL-terminated. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/isdn')
-rw-r--r--drivers/isdn/isdnloop/isdnloop.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/isdn/isdnloop/isdnloop.c b/drivers/isdn/isdnloop/isdnloop.c
index 4df80fb..6a58169 100644
--- a/drivers/isdn/isdnloop/isdnloop.c
+++ b/drivers/isdn/isdnloop/isdnloop.c
@@ -1070,6 +1070,12 @@ isdnloop_start(isdnloop_card * card, isdnloop_sdef * sdefp)
return -EBUSY;
if (copy_from_user((char *) &sdef, (char *) sdefp, sizeof(sdef)))
return -EFAULT;
+
+ for (i = 0; i < 3; i++) {
+ if (!memchr(sdef.num[i], 0, sizeof(sdef.num[i])))
+ return -EINVAL;
+ }
+
spin_lock_irqsave(&card->isdnloop_lock, flags);
switch (sdef.ptype) {
case ISDN_PTYPE_EURO: