netdev - Re: [PATCH] keys, dns: Fix size check of V1 server-list header

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]

Date: Mon, 22 Jan 2024 08:32:20 +0100
From: Petr Vorel <pvorel@...e.cz>
To: sedat.dilek@...il.com,
	David Howells <dhowells@...hat.com>
Cc: ceph-devel@...r.kernel.org,
	davem@...emloft.net,
	eadavis@...com,
	edumazet@...gle.com,
	horms@...nel.org,
	jaltman@...istor.com,
	jarkko@...nel.org,
	jlayton@...hat.com,
	keyrings@...r.kernel.org,
	kuba@...nel.org,
	linux-afs@...ts.infradead.org,
	linux-cifs@...r.kernel.org,
	linux-fsdevel@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	linux-nfs@...r.kernel.org,
	marc.dionne@...istor.com,
	markus.suvanto@...il.com,
	netdev@...r.kernel.org,
	pabeni@...hat.com,
	pengfei.xu@...el.com,
	smfrench@...il.com,
	stable@...r.kernel.org,
	torvalds@...ux-foundation.org,
	wang840925@...il.com,
	sashal@...nel.org,
	gregkh@...uxfoundation.org,
	pvorel@...e.cz
Subject: Re: [PATCH] keys, dns: Fix size check of V1 server-list header

From: Sedat Dilek <sedat.dilek@...il.com>

On Wed, Jan 10, 2024 at 10:12 PM David Howells <dhowells@...hat.com> wrote:
>
>
> Fix the size check added to dns_resolver_preparse() for the V1 server-list
> header so that it doesn't give EINVAL if the size supplied is the same as
> the size of the header struct (which should be valid).
>
> This can be tested with:
>
>         echo -n -e '\0\0\01\xff\0\0' | keyctl padd dns_resolver desc @p
>
> which will give "add_key: Invalid argument" without this fix.
>
> Fixes: 1997b3cb4217 ("keys, dns: Fix missing size check of V1 server-list header")

[ CC stable@...r.kernel.org ]

Your (follow-up) patch is now upstream.

https://git.kernel.org/linus/acc657692aed438e9931438f8c923b2b107aebf9

This misses CC: Stable Tag as suggested by Linus.

Looks like linux-6.1.y and linux-6.6.y needs it, too.

https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.11&id=da89365158f6f656b28bcdbcbbe9eaf97c63c474
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.72&id=079eefaecfd7bbb8fcc30eccb0dfdf50c91f1805

BG,
-Sedat-

Hi Greg, Sasa,

could you please add this also to linux-6.1.y and linux-6.6.y?  (Easily
applicable to both, needed for both.) Or is there any reason why it's not
being added?

Kind regards,
Petr

> Reported-by: Pengfei Xu <pengfei.xu@...el.com>
> Link: https://lore.kernel.org/r/ZZ4fyY4r3rqgZL+4@xpf.sh.intel.com/
> Signed-off-by: David Howells <dhowells@...hat.com>
> cc: Edward Adam Davis <eadavis@...com>
> cc: Linus Torvalds <torvalds@...ux-foundation.org>
> cc: Simon Horman <horms@...nel.org>
> Cc: Jarkko Sakkinen <jarkko@...nel.org>
> Cc: Jeffrey E Altman <jaltman@...istor.com>
> Cc: Wang Lei <wang840925@...il.com>
> Cc: Jeff Layton <jlayton@...hat.com>
> Cc: Steve French <sfrench@...ibm.com>
> Cc: Marc Dionne <marc.dionne@...istor.com>
> Cc: "David S. Miller" <davem@...emloft.net>
> Cc: Eric Dumazet <edumazet@...gle.com>
> Cc: Jakub Kicinski <kuba@...nel.org>
> Cc: Paolo Abeni <pabeni@...hat.com>
> ---
>  net/dns_resolver/dns_key.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/dns_resolver/dns_key.c b/net/dns_resolver/dns_key.c
> index f18ca02aa95a..c42ddd85ff1f 100644
> --- a/net/dns_resolver/dns_key.c
> +++ b/net/dns_resolver/dns_key.c
> @@ -104,7 +104,7 @@ dns_resolver_preparse(struct key_preparsed_payload *prep)
>                 const struct dns_server_list_v1_header *v1;
>
>                 /* It may be a server list. */
> -               if (datalen <= sizeof(*v1))
> +               if (datalen < sizeof(*v1))
>                         return -EINVAL;
>
>                 v1 = (const struct dns_server_list_v1_header *)data;
>
>