diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2014-04-02 12:48:42 +0900 |
---|---|---|
committer | Show Liu <show.liu@linaro.org> | 2014-06-18 11:39:55 +0800 |
commit | 0766f7d1df0c9888f7d5254da5bfa9d9f8b95099 (patch) | |
tree | 9d280b8fd951ff721c39be6e82ab582bc2b8673f | |
parent | b3fefa48fbb09da3526a96fcc36e0b6712e2d0b2 (diff) |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/isdn/isdnloop/isdnloop.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/isdn/isdnloop/isdnloop.c b/drivers/isdn/isdnloop/isdnloop.c index 02125e6a910..e1f8748ff25 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: |