From: YOSHIFUJI Hideaki <hideaki@yoshifuji.org>
To: Vegard Nossum <vegard.nossum@oracle.com>, netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Dan Carpenter <dan.carpenter@oracle.com>,
"David S. Miller" <davem@davemloft.net>,
stable@vger.kernel.org,
YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Subject: Re: [PATCH] isdnloop: NUL-terminate strings from userspace
Date: Tue, 01 Apr 2014 20:23:44 +0900 [thread overview]
Message-ID: <533AA1C0.8030609@yoshifuji.org> (raw)
In-Reply-To: <1396346898-8950-1-git-send-email-vegard.nossum@oracle.com>
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().
:
> 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';
> +
Why don't we return -EINVAL if it is not correctly terminated by NUL?
--yoshfuji
next prev parent reply other threads:[~2014-04-01 11:29 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-01 10:08 Vegard Nossum
2014-04-01 10:30 ` Hannes Frederic Sowa
2014-04-01 10:46 ` Vegard Nossum
2014-04-01 11:02 ` Hannes Frederic Sowa
2014-04-01 12:35 ` Dan Carpenter
2014-04-01 20:18 ` David Miller
2014-04-02 3:48 ` [PATCH] isdnloop: Validate NUL-terminated strings from user YOSHIFUJI Hideaki
2014-04-03 15:27 ` David Miller
2014-04-02 8:47 ` [patch 1/2] lib/string.c: use the name "C-string" in comments Dan Carpenter
2014-04-02 8:47 ` [patch 2/2] lib/string.c: strlcpy() might read too far Dan Carpenter
2014-04-14 21:46 ` Andrew Morton
2014-04-15 10:38 ` Dan Carpenter
2014-04-14 22:21 ` Dave Jones
2014-04-01 11:23 ` YOSHIFUJI Hideaki [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-03-07 10:56 [PATCH] isdnloop: NUL-terminate strings from userspace Vegard Nossum
2014-03-07 11:26 ` Dan Carpenter
2014-03-07 11:42 ` Vegard Nossum
2014-03-07 11:52 ` Dan Carpenter
2014-03-07 12:44 ` Vegard Nossum
2014-03-07 13:05 ` Dan Carpenter
2014-03-31 12:56 ` Vegard Nossum
2014-03-31 13:36 ` Dan Carpenter
2014-03-31 13:44 ` Vegard Nossum
2014-03-31 16:48 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=533AA1C0.8030609@yoshifuji.org \
--to=hideaki@yoshifuji.org \
--cc=dan.carpenter@oracle.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=vegard.nossum@oracle.com \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome