linux-kernel - Re: [PATCH 01/24] fix default __strnlen

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <4E5EC3FE.10307@gmail.com>
Date:	Thu, 01 Sep 2011 09:30:06 +1000
From:	Ryan Mallon <rmallon@...il.com>
To:	Mark Salter <msalter@...hat.com>
CC:	linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
	ming.lei@...onical.com, stern@...land.harvard.edu
Subject: Re: [PATCH 01/24] fix default __strnlen_user macro

On 01/09/11 07:26, Mark Salter wrote:
> The existing __strnlen_user macro simply resolved to strnlen. However, the
> count returned by strnlen_user should include the NULL byte. This patch
> fixes the __strnlen_user macro to include the NULL byte in the count.
>
> Signed-off-by: Mark Salter<msalter@...hat.com>
> ---
>   include/asm-generic/uaccess.h |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
> index ac68c99..1d0fdf8 100644
> --- a/include/asm-generic/uaccess.h
> +++ b/include/asm-generic/uaccess.h
> @@ -289,7 +289,7 @@ strncpy_from_user(char *dst, const char __user *src, long count)
>    * Return 0 on exception, a value greater than N if too long
>    */
>   #ifndef __strnlen_user
> -#define __strnlen_user strnlen
> +#define __strnlen_user(s, n) (strnlen((s), (n)) + 1)
>   #endif

I don't think this is correct because if you hit maxlen you will add one 
to it. e.g. __strnlen_user("abcd\0", 3) would return 4 instead of 3.

It should probably be something like this:

#define __strnlen_user(s, n) ({		\
	size_t k = strnlen(s, n);	\
	k<  n ? k + 1 : n; })


I wonder if this change will break anything since it has been incorrect 
(according to the comment in uaccess.h at least) for a while. Why does 
__strnlen_user have different semantics to strnlen anway?

~Ryan


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/