summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>2014-04-02 12:48:42 +0900
committerDavid S. Miller <davem@davemloft.net>2014-04-03 11:26:24 -0400
commit77bc6bed7121936bb2e019a8c336075f4c8eef62 (patch)
tree422579145a628d3ba21bfeb28191a5e4d8bf3133
parent79eb9d28c9b22fa419e2c3f1b2cc6e285720ae41 (diff)
downloadblackbird-op-linux-77bc6bed7121936bb2e019a8c336075f4c8eef62.tar.gz
blackbird-op-linux-77bc6bed7121936bb2e019a8c336075f4c8eef62.zip
isdnloop: Validate NUL-terminated strings from user.
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>
-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 02125e6a9109..e1f8748ff25d 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:
OpenPOWER on IntegriCloud