2 files changed, 5 insertions, 2 deletions

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 5b364b0a6a28..2a7d2132a1ae 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -838,7 +838,10 @@ static inline int xfrm_state_kern(struct xfrm_state *x)
 
 static inline int xfrm_id_proto_match(u8 proto, u8 userproto)
 {
-        return (userproto == IPSEC_PROTO_ANY || proto == userproto);
+        return (!userproto || proto == userproto ||
+                (userproto == IPSEC_PROTO_ANY && (proto == IPPROTO_AH ||
+                                                  proto == IPPROTO_ESP ||
+                                                  proto == IPPROTO_COMP)));
 }
 
 /*
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 0d580ac19771..41f3d51ffc33 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -542,7 +542,7 @@ static int xfrm_dump_sa(struct sk_buff *skb, struct netlink_callback *cb)
         info.nlmsg_flags = NLM_F_MULTI;
         info.this_idx = 0;
         info.start_idx = cb->args[0];
-        (void) xfrm_state_walk(IPSEC_PROTO_ANY, dump_one_state, &info);
+        (void) xfrm_state_walk(0, dump_one_state, &info);
         cb->args[0] = info.this_idx;
 
         return skb->len;