Skip to contentSkip to conversation

keys, dns: Fix size check of V1 server-list header

PATCH In review David Howells 5 participants 7 messages Jan 10, 2024 – Jan 22, 2024

Subsystems (9)
lore
Share & tools
lore

David Howells

author maintainer
#0 lore raw

PATCH 1/1 keys, dns: Fix size check of V1 server-list header

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 Edward Adam Davis <[email protected]>
cc Linus Torvalds <[email protected]>
cc Simon Horman <[email protected]>
Cc Jarkko Sakkinen <[email protected]>
Cc Jeffrey E Altman <[email protected]>
Cc Wang Lei <[email protected]>
Cc Jeff Layton <[email protected]>
Cc Steve French <[email protected]>
Cc Marc Dionne <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Paolo Abeni <[email protected]>
---
 net/dns_resolver/dns_key.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/dns_resolver/dns_key.c +1 -1
index f18ca02aa95a..c42ddd85ff1f 100644
@@ -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;
#1 lore raw
Quoted 6 lines · David Howells

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).

Quoted 7 lines

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 [email protected] ]

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-

Quoted 35 lines
cc Edward Adam Davis <[email protected]>
cc Linus Torvalds <[email protected]>
cc Simon Horman <[email protected]>
Cc Jarkko Sakkinen <[email protected]>
Cc Jeffrey E Altman <[email protected]>
Cc Wang Lei <[email protected]>
Cc Jeff Layton <[email protected]>
Cc Steve French <[email protected]>
Cc Marc Dionne <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Paolo Abeni <[email protected]>
---
 net/dns_resolver/dns_key.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/dns_resolver/dns_key.c +1 -1
index f18ca02aa95a..c42ddd85ff1f 100644
@@ -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;
#2 lore raw
Quoted 31 lines · Petr Vorel

From: Sedat Dilek <[email protected]>

Quoted 6 lines · David Howells

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).

Quoted 7 lines

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 [email protected] ]

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

Quoted 9 lines

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?

Great!

I forgot to CC Greg and Sasha directly.

Thanks.

BG,
-Sedat-

Quoted 39 lines

Kind regards,
Petr

Quoted 35 lines
cc Edward Adam Davis <[email protected]>
cc Linus Torvalds <[email protected]>
cc Simon Horman <[email protected]>
Cc Jarkko Sakkinen <[email protected]>
Cc Jeffrey E Altman <[email protected]>
Cc Wang Lei <[email protected]>
Cc Jeff Layton <[email protected]>
Cc Steve French <[email protected]>
Cc Marc Dionne <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Paolo Abeni <[email protected]>
---
 net/dns_resolver/dns_key.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/dns_resolver/dns_key.c +1 -1
index f18ca02aa95a..c42ddd85ff1f 100644
@@ -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;
#3 lore raw
Quoted 43 lines · Sedat Dilek
Quoted 31 lines · Petr Vorel

From: Sedat Dilek <[email protected]>

Quoted 6 lines · David Howells

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).

Quoted 7 lines

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 [email protected] ]

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

Quoted 9 lines

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?

Quoted 6 lines

Great!

I forgot to CC Greg and Sasha directly.

Thanks.

Addendum:

Linus says:
"
Bah. Obvious fix is obvious.

Mind sending it as a proper patch with sign-off etc, and we'll get this fixed and marked for stable.
"

https://lore.kernel.org/all/CAHk-=wiyG8BKKZmU7CDHC8+rmvBndrqNSgLV6LtuqN8W_gL3hA@mail.gmail.com/

-Sedat-

Quoted 42 lines

BG,
-Sedat-

Quoted 39 lines

Kind regards,
Petr

Quoted 35 lines
cc Edward Adam Davis <[email protected]>
cc Linus Torvalds <[email protected]>
cc Simon Horman <[email protected]>
Cc Jarkko Sakkinen <[email protected]>
Cc Jeffrey E Altman <[email protected]>
Cc Wang Lei <[email protected]>
Cc Jeff Layton <[email protected]>
Cc Steve French <[email protected]>
Cc Marc Dionne <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Paolo Abeni <[email protected]>
---
 net/dns_resolver/dns_key.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/dns_resolver/dns_key.c +1 -1
index f18ca02aa95a..c42ddd85ff1f 100644
@@ -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;
maintainer
#4 lore raw
In reply to Sedat Dilek
Quoted 21 lines · Petr Vorel

From: Sedat Dilek <[email protected]>

Quoted 6 lines · David Howells

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).

Quoted 7 lines

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 [email protected] ]

Your (follow-up) patch is now upstream.

Quoted 8 lines

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

And 5.10.y and 5.15.y. Now queued up, thanks.

greg k-h

reviewer Reviewed-by on v1 1/1
#5 lore raw
In reply to David Howells
Quoted 7 lines · David Howells

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:

Quoted 8 lines
        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")
maintainer Reviewed-by on v1 1/1
#6 lore raw
In reply to David Howells
Quoted 37 lines · David Howells

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 Edward Adam Davis <[email protected]>
cc Linus Torvalds <[email protected]>
cc Simon Horman <[email protected]>
Cc Jarkko Sakkinen <[email protected]>
Cc Jeffrey E Altman <[email protected]>
Cc Wang Lei <[email protected]>
Cc Jeff Layton <[email protected]>
Cc Steve French <[email protected]>
Cc Marc Dionne <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Paolo Abeni <[email protected]>
---
 net/dns_resolver/dns_key.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/dns_resolver/dns_key.c +0 -0
index f18ca02aa95a..c42ddd85ff1f 100644

net/dns_resolver/dns_key.c dns_resolver_preparse(struct key_preparsed_payload *prep) · line 110

Quoted 8 lines
net/dns_resolver/dns_key.c +1 -1
@@ -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;

BR, Jarkko