* [PATCH ipsec] Revert "net: af_key: add check for pfkey_broadcast in function pfkey_process"
@ 2022-05-23 16:01 Michal Kubecek
2022-05-23 17:23 ` Florian Fainelli
0 siblings, 1 reply; 3+ messages in thread
From: Michal Kubecek @ 2022-05-23 16:01 UTC (permalink / raw)
To: Steffen Klassert, netdev
Cc: Jiasheng Jiang, Herbert Xu, David S. Miller, Jakub Kicinski,
Eric Dumazet, Paolo Abeni, linux-kernel
This reverts commit 4dc2a5a8f6754492180741facf2a8787f2c415d7.
A non-zero return value from pfkey_broadcast() does not necessarily mean
an error occurred as this function returns -ESRCH when no registered
listener received the message. In particular, a call with
BROADCAST_PROMISC_ONLY flag and null one_sk argument can never return
zero so that this commit in fact prevents processing any PF_KEY message.
One visible effect is that racoon daemon fails to find encryption
algorithms like aes and refuses to start.
Excluding -ESRCH return value would fix this but it's not obvious that
we really want to bail out here and most other callers of
pfkey_broadcast() also ignore the return value. Also, as pointed out by
Steffen Klassert, PF_KEY is kind of deprecated and newer userspace code
should use netlink instead so that we should only disturb the code for
really important fixes.
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
---
net/key/af_key.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/net/key/af_key.c b/net/key/af_key.c
index 339d95df19d3..fbb2c16693ad 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -2826,10 +2826,8 @@ static int pfkey_process(struct sock *sk, struct sk_buff *skb, const struct sadb
void *ext_hdrs[SADB_EXT_MAX];
int err;
- err = pfkey_broadcast(skb_clone(skb, GFP_KERNEL), GFP_KERNEL,
- BROADCAST_PROMISC_ONLY, NULL, sock_net(sk));
- if (err)
- return err;
+ pfkey_broadcast(skb_clone(skb, GFP_KERNEL), GFP_KERNEL,
+ BROADCAST_PROMISC_ONLY, NULL, sock_net(sk));
memset(ext_hdrs, 0, sizeof(ext_hdrs));
err = parse_exthdrs(skb, hdr, ext_hdrs);
--
2.36.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH ipsec] Revert "net: af_key: add check for pfkey_broadcast in function pfkey_process"
2022-05-23 16:01 [PATCH ipsec] Revert "net: af_key: add check for pfkey_broadcast in function pfkey_process" Michal Kubecek
@ 2022-05-23 17:23 ` Florian Fainelli
2022-05-23 19:50 ` Michal Kubecek
0 siblings, 1 reply; 3+ messages in thread
From: Florian Fainelli @ 2022-05-23 17:23 UTC (permalink / raw)
To: Michal Kubecek, Steffen Klassert, netdev
Cc: Jiasheng Jiang, Herbert Xu, David S. Miller, Jakub Kicinski,
Eric Dumazet, Paolo Abeni, linux-kernel
On 5/23/22 09:01, Michal Kubecek wrote:
> This reverts commit 4dc2a5a8f6754492180741facf2a8787f2c415d7.
>
> A non-zero return value from pfkey_broadcast() does not necessarily mean
> an error occurred as this function returns -ESRCH when no registered
> listener received the message. In particular, a call with
> BROADCAST_PROMISC_ONLY flag and null one_sk argument can never return
> zero so that this commit in fact prevents processing any PF_KEY message.
> One visible effect is that racoon daemon fails to find encryption
> algorithms like aes and refuses to start.
>
> Excluding -ESRCH return value would fix this but it's not obvious that
> we really want to bail out here and most other callers of
> pfkey_broadcast() also ignore the return value. Also, as pointed out by
> Steffen Klassert, PF_KEY is kind of deprecated and newer userspace code
> should use netlink instead so that we should only disturb the code for
> really important fixes.
>
> Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
Maybe you can add a comment above the call such that future tool-based
patches submissions to give the author a chance to read the comment
above and ask oneself twice whether this is relevant or not?
--
Florian
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH ipsec] Revert "net: af_key: add check for pfkey_broadcast in function pfkey_process"
2022-05-23 17:23 ` Florian Fainelli
@ 2022-05-23 19:50 ` Michal Kubecek
0 siblings, 0 replies; 3+ messages in thread
From: Michal Kubecek @ 2022-05-23 19:50 UTC (permalink / raw)
To: Florian Fainelli
Cc: Steffen Klassert, netdev, Jiasheng Jiang, Herbert Xu,
David S. Miller, Jakub Kicinski, Eric Dumazet, Paolo Abeni,
linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1421 bytes --]
On Mon, May 23, 2022 at 10:23:22AM -0700, Florian Fainelli wrote:
> On 5/23/22 09:01, Michal Kubecek wrote:
> > This reverts commit 4dc2a5a8f6754492180741facf2a8787f2c415d7.
> >
> > A non-zero return value from pfkey_broadcast() does not necessarily mean
> > an error occurred as this function returns -ESRCH when no registered
> > listener received the message. In particular, a call with
> > BROADCAST_PROMISC_ONLY flag and null one_sk argument can never return
> > zero so that this commit in fact prevents processing any PF_KEY message.
> > One visible effect is that racoon daemon fails to find encryption
> > algorithms like aes and refuses to start.
> >
> > Excluding -ESRCH return value would fix this but it's not obvious that
> > we really want to bail out here and most other callers of
> > pfkey_broadcast() also ignore the return value. Also, as pointed out by
> > Steffen Klassert, PF_KEY is kind of deprecated and newer userspace code
> > should use netlink instead so that we should only disturb the code for
> > really important fixes.
> >
> > Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
>
> Maybe you can add a comment above the call such that future tool-based
> patches submissions to give the author a chance to read the comment above
> and ask oneself twice whether this is relevant or not?
Good point, I'll send a v2 with a warning comment in a moment.
Micha
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-05-23 19:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-23 16:01 [PATCH ipsec] Revert "net: af_key: add check for pfkey_broadcast in function pfkey_process" Michal Kubecek
2022-05-23 17:23 ` Florian Fainelli
2022-05-23 19:50 ` Michal Kubecek
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.