Re: [PATCH 1/1] KEYS: encrypted: fix buffer overread in valid_master_desc()
From: Eric Biggers
Date: Mon Feb 05 2018 - 20:54:59 EST
On Mon, Feb 05, 2018 at 12:02:46PM -0800, Jin Qian wrote:
> From: Eric Biggers <ebiggers@xxxxxxxxxx>
>
> commit 794b4bc292f5d31739d89c0202c54e7dc9bc3add upstream
>
> With the 'encrypted' key type it was possible for userspace to provide a
> data blob ending with a master key description shorter than expected,
> e.g. 'keyctl add encrypted desc "new x" @s'. When validating such a
> master key description, validate_master_desc() could read beyond the end
> of the buffer. Fix this by using strncmp() instead of memcmp(). [Also
> clean up the code to deduplicate some logic.]
>
> Cc: stable@xxxxxxxxxxxxxxx
> Cc: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx>
> Signed-off-by: Eric Biggers <ebiggers@xxxxxxxxxx>
> Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
> Signed-off-by: James Morris <james.l.morris@xxxxxxxxxx>
> Signed-off-by: Jin Qian <jinqian@xxxxxxxxxxx>
> ---
> security/keys/encrypted-keys/encrypted.c | 31 +++++++++++++++----------------
> 1 file changed, 15 insertions(+), 16 deletions(-)
>
Hi Jin, see Documentation/stable_kernel_rules.txt -- patches for stable should
be sent To: stable@xxxxxxxxxxxxxxx (and generally with a lighter Cc: list,
unless it's a complicated backport), and you need to say which kernel version(s)
it should be applied to. Also for upstream commits that cherry-pick cleanly,
such as this one, you don't need to send an actual patch but rather just request
that it be applied. The reason it should be applied is helpful too; in this
case the commit fixes a bug that caused a KASAN warning.
Thanks!
- Eric