Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec

[linux-2.6-block.git] / net / key / af_key.c

diff --git a/net/key/af_key.c b/net/key/af_key.c
index 11e1a3a3e442f514f49e68966a4848ccd021430a..fb16d7c4e1b8d9b270e918222e23d12c00d109bb 100644 (file)
--- 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);