| From 3d614cf831e8bb8339f89f8f26992da86c1017f7 Mon Sep 17 00:00:00 2001 |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| Date: Thu, 14 Nov 2013 11:21:10 +0300 |
| Subject: isdnloop: use strlcpy() instead of strcpy() |
| |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| |
| [ Upstream commit f9a23c84486ed350cce7bb1b2828abd1f6658796 ] |
| |
| These strings come from a copy_from_user() and there is no way to be |
| sure they are NUL terminated. |
| |
| Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/isdn/isdnloop/isdnloop.c | 8 +++++--- |
| 1 file changed, 5 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/isdn/isdnloop/isdnloop.c |
| +++ b/drivers/isdn/isdnloop/isdnloop.c |
| @@ -1083,8 +1083,10 @@ isdnloop_start(isdnloop_card *card, isdn |
| spin_unlock_irqrestore(&card->isdnloop_lock, flags); |
| return -ENOMEM; |
| } |
| - for (i = 0; i < 3; i++) |
| - strcpy(card->s0num[i], sdef.num[i]); |
| + for (i = 0; i < 3; i++) { |
| + strlcpy(card->s0num[i], sdef.num[i], |
| + sizeof(card->s0num[0])); |
| + } |
| break; |
| case ISDN_PTYPE_1TR6: |
| if (isdnloop_fake(card, "DRV1.04TC-1TR6-CAPI-CNS-BASIS-29.11.95", |
| @@ -1097,7 +1099,7 @@ isdnloop_start(isdnloop_card *card, isdn |
| spin_unlock_irqrestore(&card->isdnloop_lock, flags); |
| return -ENOMEM; |
| } |
| - strcpy(card->s0num[0], sdef.num[0]); |
| + strlcpy(card->s0num[0], sdef.num[0], sizeof(card->s0num[0])); |
| card->s0num[1][0] = '\0'; |
| card->s0num[2][0] = '\0'; |
| break; |
