From: Nicolai Stange <nstange@suse.de>
To: "David S. Miller" <davem@davemloft.net>,
David Ahern <dsahern@kernel.org>
Cc: Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Simon Horman <horms@kernel.org>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Nicolai Stange <nstange@suse.de>
Subject: [PATCH v1 1/4] ipv6: sr: reject unsupported SR HMAC algos with -ENOENT
Date: Mon, 10 Mar 2025 17:58:54 +0100 [thread overview]
Message-ID: <20250310165857.3584612-2-nstange@suse.de> (raw)
In-Reply-To: <20250310165857.3584612-1-nstange@suse.de>
The IPv6 SR HMAC implementation supports sha1 and sha256, but would
silently accept any other value configured for the ->alg_id -- it just
would fail to create such an HMAC then.
That's certainly fine, as users attempting to configure random ->alg_ids
don't deserve any better.
However, a subsequent patch will enable a scenario where the instantiation
of a supported HMAC algorithm may fail, namely with SHA1 when booted in
FIPS mode.
As such an instantiation failure would depend on the system configuration,
i.e. whether FIPS mode is enabled or not, it would be better to report a
proper error back at configuration time rather than to e.g. silently drop
packets during operation.
Make __hmac_get_algo() to filter algos with ->tfms == NULL, indicating
an instantiation failure. Note that this cannot happen yet at this very
moment, as the IPv6 SR HMAC __init code would have failed then. As said,
it's a scenario enabled only with a subsequent patch.
Make seg6_hmac_info_add() to return -ENOENT to the user in case
__hmac_get_algo() fails to find a matching algo.
Signed-off-by: Nicolai Stange <nstange@suse.de>
---
net/ipv6/seg6_hmac.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/net/ipv6/seg6_hmac.c b/net/ipv6/seg6_hmac.c
index bbf5b84a70fc..77bdb41d3b82 100644
--- a/net/ipv6/seg6_hmac.c
+++ b/net/ipv6/seg6_hmac.c
@@ -108,7 +108,7 @@ static struct seg6_hmac_algo *__hmac_get_algo(u8 alg_id)
alg_count = ARRAY_SIZE(hmac_algos);
for (i = 0; i < alg_count; i++) {
algo = &hmac_algos[i];
- if (algo->alg_id == alg_id)
+ if (algo->alg_id == alg_id && algo->tfms)
return algo;
}
@@ -293,8 +293,13 @@ EXPORT_SYMBOL(seg6_hmac_info_lookup);
int seg6_hmac_info_add(struct net *net, u32 key, struct seg6_hmac_info *hinfo)
{
struct seg6_pernet_data *sdata = seg6_pernet(net);
+ struct seg6_hmac_algo *algo;
int err;
+ algo = __hmac_get_algo(hinfo->alg_id);
+ if (!algo || !algo->tfms)
+ return -ENOENT;
+
err = rhashtable_lookup_insert_fast(&sdata->hmac_infos, &hinfo->node,
rht_params);
--
2.47.1
next prev parent reply other threads:[~2025-03-10 16:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-10 16:58 [PATCH v1 0/4] ipv6: sr: make SR HMAC __init continue on missing algos Nicolai Stange
2025-03-10 16:58 ` Nicolai Stange [this message]
2025-03-18 9:02 ` [PATCH v1 1/4] ipv6: sr: reject unsupported SR HMAC algos with -ENOENT Paolo Abeni
2025-03-10 16:58 ` [PATCH v1 2/4] ipv6: sr: factor seg6_hmac_exit()'s per-algo code into separate function Nicolai Stange
2025-03-10 16:58 ` [PATCH v1 3/4] ipv6: sr: factor seg6_hmac_init_algo()'s " Nicolai Stange
2025-03-18 9:07 ` Paolo Abeni
2025-03-10 16:58 ` [PATCH v1 4/4] ipv6: sr: continue initialization at ENOENT HMAC instantiation failures Nicolai Stange
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250310165857.3584612-2-nstange@suse.de \
--to=nstange@suse.de \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®