2023-01-08 17:16:04

by Lukas Wunner

Subject: [PATCH] wifi: cfg80211: Deduplicate certificate loading

load_keys_from_buffer() in net/wireless/reg.c duplicates
x509_load_certificate_list() in crypto/asymmetric_keys/x509_loader.c
for no apparent reason.

Deduplicate it. No functional change intended.

Signed-off-by: Lukas Wunner <[email protected]>
Cc: David Howells <[email protected]>
---
crypto/asymmetric_keys/x509_loader.c | 1 +
net/wireless/reg.c | 54 +++++-----------------------
2 files changed, 9 insertions(+), 46 deletions(-)

diff --git a/crypto/asymmetric_keys/x509_loader.c b/crypto/asymmetric_keys/x509_loader.c
index 1bc169dee22e..a41741326998 100644
--- a/crypto/asymmetric_keys/x509_loader.c
+++ b/crypto/asymmetric_keys/x509_loader.c
@@ -55,3 +55,4 @@ int x509_load_certificate_list(const u8 cert_list[],
pr_err("Problem parsing in-kernel X.509 certificate list\n");
return 0;
}
+EXPORT_SYMBOL_GPL(x509_load_certificate_list);
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 4f3f31244e8b..af65196c916e 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -737,51 +737,9 @@ static bool valid_country(const u8 *data, unsigned int size,
}

#ifdef CONFIG_CFG80211_REQUIRE_SIGNED_REGDB
-static struct key *builtin_regdb_keys;
-
-static void __init load_keys_from_buffer(const u8 *p, unsigned int buflen)
-{
- const u8 *end = p + buflen;
- size_t plen;
- key_ref_t key;
-
- while (p < end) {
- /* Each cert begins with an ASN.1 SEQUENCE tag and must be more
- * than 256 bytes in size.
- */
- if (end - p < 4)
- goto dodgy_cert;
- if (p[0] != 0x30 &&
- p[1] != 0x82)
- goto dodgy_cert;
- plen = (p[2] << 8) | p[3];
- plen += 4;
- if (plen > end - p)
- goto dodgy_cert;
-
- key = key_create_or_update(make_key_ref(builtin_regdb_keys, 1),
- "asymmetric", NULL, p, plen,
- ((KEY_POS_ALL & ~KEY_POS_SETATTR) |
- KEY_USR_VIEW | KEY_USR_READ),
- KEY_ALLOC_NOT_IN_QUOTA |
- KEY_ALLOC_BUILT_IN |
- KEY_ALLOC_BYPASS_RESTRICTION);
- if (IS_ERR(key)) {
- pr_err("Problem loading in-kernel X.509 certificate (%ld)\n",
- PTR_ERR(key));
- } else {
- pr_notice("Loaded X.509 cert '%s'\n",
- key_ref_to_ptr(key)->description);
- key_ref_put(key);
- }
- p += plen;
- }
-
- return;
+#include <keys/asymmetric-type.h>

-dodgy_cert:
- pr_err("Problem parsing in-kernel X.509 certificate list\n");
-}
+static struct key *builtin_regdb_keys;

static int __init load_builtin_regdb_keys(void)
{
@@ -797,11 +755,15 @@ static int __init load_builtin_regdb_keys(void)
pr_notice("Loading compiled-in X.509 certificates for regulatory database\n");

#ifdef CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS
- load_keys_from_buffer(shipped_regdb_certs, shipped_regdb_certs_len);
+ x509_load_certificate_list(shipped_regdb_certs,
+ shipped_regdb_certs_len,
+ builtin_regdb_keys);
#endif
#ifdef CONFIG_CFG80211_EXTRA_REGDB_KEYDIR
if (CONFIG_CFG80211_EXTRA_REGDB_KEYDIR[0] != '\0')
- load_keys_from_buffer(extra_regdb_certs, extra_regdb_certs_len);
+ x509_load_certificate_list(extra_regdb_certs,
+ extra_regdb_certs_len,
+ builtin_regdb_keys);
#endif

return 0;
--
2.39.0

2023-01-10 12:50:45

by Johannes Berg

Subject: Re: [PATCH] wifi: cfg80211: Deduplicate certificate loading

On Sun, 2023-01-08 at 18:08 +0100, Lukas Wunner wrote:
> load_keys_from_buffer() in net/wireless/reg.c duplicates
> x509_load_certificate_list() in crypto/asymmetric_keys/x509_loader.c
> for no apparent reason.
>

Well, unless I'm messing up the git blame/history search, it didn't
exist as a standalone function when the reg.c code was written :)

johannes

2023-01-18 22:32:57

by David Howells

Subject: Re: [PATCH] wifi: cfg80211: Deduplicate certificate loading

Lukas Wunner <[email protected]> wrote:

> load_keys_from_buffer() in net/wireless/reg.c duplicates
> x509_load_certificate_list() in crypto/asymmetric_keys/x509_loader.c
> for no apparent reason.
>
> Deduplicate it. No functional change intended.
>
> Signed-off-by: Lukas Wunner <[email protected]>
> Cc: David Howells <[email protected]>

Acked-by: David Howells <[email protected]>