On Tue, Apr 01, 2014 at 12:08:18PM +0200, Vegard Nossum wrote:
> Both the in-kernel and BSD strlcpy() require that the source string is
> NUL terminated. We could use strncpy() + explicitly terminate the result,
> but this relies on src and dest having the same size, so the safest thing
> to do seems to explicitly terminate the source string before doing the
> strlcpy().
>
> Fixes: f9a23c84486ed35 ("isdnloop: use strlcpy() instead of strcpy()")
> Cc: Dan Carpenter <dan.carpen...@oracle.com>
> Cc: David S. Miller <da...@davemloft.net>
> Cc: sta...@vger.kernel.org
> Signed-off-by: Vegard Nossum <vegard.nos...@oracle.com>
> ---
> drivers/isdn/isdnloop/isdnloop.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/isdn/isdnloop/isdnloop.c
> b/drivers/isdn/isdnloop/isdnloop.c
> index 02125e6..50cd348 100644
> --- a/drivers/isdn/isdnloop/isdnloop.c
> +++ b/drivers/isdn/isdnloop/isdnloop.c
> @@ -1070,6 +1070,14 @@ isdnloop_start(isdnloop_card *card, isdnloop_sdef
> *sdefp)
> return -EBUSY;
> if (copy_from_user((char *) &sdef, (char *) sdefp, sizeof(sdef)))
> return -EFAULT;
> +
> + /*
> + * Null terminate strings from userspace so we don't have to worry
> + * about this later on.
> + */
> + for (i = 0; i < 3; i++)
> + sdef.num[i][sizeof(sdef.num[0]) - 1] = '\0';
> +
Looking down the problem, it seems the problem is that the strlen in strlcpy
could read beyond the input buffer?
To prevent this problem in other parts of the kernel wouldn't it be better to
replace the strlen with strnlen in strlcpy?
Bye,
Hannes
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
