keys, dns: Fix size check of V1 server-list header
authorDavid Howells <dhowells@redhat.com>
Wed, 10 Jan 2024 21:11:40 +0000 (21:11 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Jan 2024 23:35:41 +0000 (15:35 -0800)
commit06173edfc770bb0fac067181db0c833fa7bbf031
tree5781a8aecd8b4c572496dab00c7a8fb243cd452a
parent3db79d21cf9cd1f52b4e0b2497e47b2967495a25
keys, dns: Fix size check of V1 server-list header

commit acc657692aed438e9931438f8c923b2b107aebf9 upstream.

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")
Reported-by: Pengfei Xu <pengfei.xu@intel.com>
Link: https://lore.kernel.org/r/ZZ4fyY4r3rqgZL+4@xpf.sh.intel.com/
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Petr Vorel <pvorel@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/dns_resolver/dns_key.c