1 files changed, 18 insertions, 1 deletions

diff --git a/net/key/af_key.c b/net/key/af_key.c
index e1c69d024197..f0879c19f452 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -1798,6 +1798,7 @@ static void pfkey_dump_sa_done(struct pfkey_sock *pfk)
 static int pfkey_dump(struct sock *sk, struct sk_buff *skb, const struct sadb_msg *hdr, void * const *ext_hdrs)
 {
         u8 proto;
+        struct xfrm_filter *filter = NULL;
         struct pfkey_sock *pfk = pfkey_sk(sk);
 
         if (pfk->dump.dump != NULL)
@@ -1807,11 +1808,27 @@ static int pfkey_dump(struct sock *sk, struct sk_buff *skb, const struct sadb_ms
         if (proto == 0)
                 return -EINVAL;
 
+        if (ext_hdrs[SADB_X_EXT_FILTER - 1]) {
+                struct sadb_x_filter *xfilter = ext_hdrs[SADB_X_EXT_FILTER - 1];
+
+                filter = kmalloc(sizeof(*filter), GFP_KERNEL);
+                if (filter == NULL)
+                        return -ENOMEM;
+
+                memcpy(&filter->saddr, &xfilter->sadb_x_filter_saddr,
+                       sizeof(xfrm_address_t));
+                memcpy(&filter->daddr, &xfilter->sadb_x_filter_daddr,
+                       sizeof(xfrm_address_t));
+                filter->family = xfilter->sadb_x_filter_family;
+                filter->splen = xfilter->sadb_x_filter_splen;
+                filter->dplen = xfilter->sadb_x_filter_dplen;
+        }
+
         pfk->dump.msg_version = hdr->sadb_msg_version;
         pfk->dump.msg_portid = hdr->sadb_msg_pid;
         pfk->dump.dump = pfkey_dump_sa;
         pfk->dump.done = pfkey_dump_sa_done;
-        xfrm_state_walk_init(&pfk->dump.u.state, proto);
+        xfrm_state_walk_init(&pfk->dump.u.state, proto, filter);
 
         return pfkey_do_dump(pfk);
 }