From fbae3cf02f9401927ac8bbb6bcb609f2e21e06a7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 22 Jan 2024 07:02:16 -0800 Subject: [PATCH] 5.10-stable patches added patches: keys-dns-fix-size-check-of-v1-server-list-header.patch --- ...-size-check-of-v1-server-list-header.patch | 41 +++++++++++++++++++ queue-5.10/series | 1 + 2 files changed, 42 insertions(+) create mode 100644 queue-5.10/keys-dns-fix-size-check-of-v1-server-list-header.patch diff --git a/queue-5.10/keys-dns-fix-size-check-of-v1-server-list-header.patch b/queue-5.10/keys-dns-fix-size-check-of-v1-server-list-header.patch new file mode 100644 index 00000000000..1f034168e93 --- /dev/null +++ b/queue-5.10/keys-dns-fix-size-check-of-v1-server-list-header.patch @@ -0,0 +1,41 @@ +From acc657692aed438e9931438f8c923b2b107aebf9 Mon Sep 17 00:00:00 2001 +From: David Howells +Date: Wed, 10 Jan 2024 21:11:40 +0000 +Subject: keys, dns: Fix size check of V1 server-list header + +From: David Howells + +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 +Link: https://lore.kernel.org/r/ZZ4fyY4r3rqgZL+4@xpf.sh.intel.com/ +Signed-off-by: David Howells +Signed-off-by: Linus Torvalds +Cc: Petr Vorel +Signed-off-by: Greg Kroah-Hartman +--- + net/dns_resolver/dns_key.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/net/dns_resolver/dns_key.c ++++ b/net/dns_resolver/dns_key.c +@@ -104,7 +104,7 @@ dns_resolver_preparse(struct key_prepars + 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; diff --git a/queue-5.10/series b/queue-5.10/series index c77f51e0038..a7f8e2727f5 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -194,3 +194,4 @@ mmc-sdhci_omap-fix-ti-soc-dependencies.patch ib-iser-prevent-invalidating-wrong-mr.patch of-fix-double-free-in-of_parse_phandle_with_args_map.patch of-unittest-fix-of_count_phandle_with_args-expected-.patch +keys-dns-fix-size-check-of-v1-server-list-header.patch -- 2.47.3