summaryrefslogtreecommitdiffstats
path: root/net/key
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2022-06-01 17:44:03 -0700
committerJakub Kicinski <kuba@kernel.org>2022-06-01 17:44:04 -0700
commit2440d2068a7517f60003b0e12e5fadcebd14cda3 (patch)
treeaf2fcf7346eb69037528d93be5d68324adc2c4d2 /net/key
parent38a4762e4ba61e848c61a3b9eaa8f83cbed07b2d (diff)
parent6821ad8770340825f17962cf5ef64ebaffee7fd7 (diff)
downloadlinux-stable-2440d2068a7517f60003b0e12e5fadcebd14cda3.tar.gz
linux-stable-2440d2068a7517f60003b0e12e5fadcebd14cda3.tar.bz2
linux-stable-2440d2068a7517f60003b0e12e5fadcebd14cda3.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says: ==================== ipsec 2022-06-01 1) Revert "net: af_key: add check for pfkey_broadcast in function pfkey_process" From Michal Kubecek. 2) Don't set IPv4 DF bit when encapsulating IPv6 frames below 1280 bytes. From Maciej Żenczykowski. * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec: xfrm: do not set IPv4 DF flag when encapsulating IPv6 frames <= 1280 bytes. Revert "net: af_key: add check for pfkey_broadcast in function pfkey_process" ==================== Link: https://lore.kernel.org/r/20220601103349.2297361-1-steffen.klassert@secunet.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/key')
-rw-r--r--net/key/af_key.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c
index 11e1a3a3e442..fb16d7c4e1b8 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -2826,10 +2826,12 @@ 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;
+ /* Non-zero return value of pfkey_broadcast() does not always signal
+ * an error and even on an actual error we may still want to process
+ * the message so rather ignore the return value.
+ */
+ 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);