summaryrefslogtreecommitdiff
path: root/drivers/isdn
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2014-04-02 03:48:42 (GMT)
committerJiri Slaby <jslaby@suse.cz>2014-04-18 09:07:18 (GMT)
commit2d6c1221476d05771f8b10f6ad1575fd068ab5e2 (patch)
tree8662ae1eb3bf204aa8abb96d163541510add5072 /drivers/isdn
parent362bc7e25149fe30c5c0892611b63329433dbff8 (diff)
downloadlinux-fsl-qoriq-2d6c1221476d05771f8b10f6ad1575fd068ab5e2.tar.xz
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: Jiri Slaby <jslaby@suse.cz>
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 02125e6..e1f8748 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: