Skip to content

Commit

Permalink
keys, dns: Fix size check of V1 server-list header
Browse files Browse the repository at this point in the history
commit acc6576 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: 1997b3c ("keys, dns: Fix missing size check of V1 server-list header")
Reported-by: Pengfei Xu <[email protected]>
Link: https://lore.kernel.org/r/[email protected]/
Signed-off-by: David Howells <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Cc: Petr Vorel <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
dhowells authored and gregkh committed Jan 25, 2024
1 parent 60a9a5f commit 66b3578
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/dns_resolver/dns_key.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 66b3578

Please sign in to comment.