Darkangeel_hd
/
lineage_android_kernel_samsung_jf
mirror of https://github.com/Darkangeel-hd/lineage_android_kernel_samsung_jf.git
1
0
Fork 0
Code Issues Releases Wiki Activity

isdnloop: use strlcpy() instead of strcpy() 

[ 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>
This commit is contained in:
Dan Carpenter 2013-11-14 11:21:10 +03:00 committed by Greg Kroah-Hartman
parent e6f3fa4892
commit 0434f16410
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/isdn/isdnloop/isdnloop.c
View File

@ -1083,8 +1083,10 @@ isdnloop_start(isdnloop_card *card, isdnloop_sdef *sdefp)
spin_unlock_irqrestore(&card->isdnloop_lock, flags); spin_unlock_irqrestore(&card->isdnloop_lock, flags);
return -ENOMEM; return -ENOMEM;
} }
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++) {
strcpy(card->s0num[i], sdef.num[i]); strlcpy(card->s0num[i], sdef.num[i],
sizeof(card->s0num[0]));
}
break; break;
case ISDN_PTYPE_1TR6: case ISDN_PTYPE_1TR6:
if (isdnloop_fake(card, "DRV1.04TC-1TR6-CAPI-CNS-BASIS-29.11.95", if (isdnloop_fake(card, "DRV1.04TC-1TR6-CAPI-CNS-BASIS-29.11.95",
@ -1097,7 +1099,7 @@ isdnloop_start(isdnloop_card *card, isdnloop_sdef *sdefp)
spin_unlock_irqrestore(&card->isdnloop_lock, flags); spin_unlock_irqrestore(&card->isdnloop_lock, flags);
return -ENOMEM; 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[1][0] = '\0';
card->s0num[2][0] = '\0'; card->s0num[2][0] = '\0';
break; break;