xfrm: also check for ipv6 state in xfrm_state_keep

As commit f9d696cf414c ("xfrm: not try to delete ipcomp states when using
deleteall") does, this patch is to fix the same issue for ip6 state where
xsinfo->id.proto == IPPROTO_IPV6.

  # ip xfrm state add src 2000::1 dst 2000::2 spi 0x1000 \
    proto comp comp deflate mode tunnel sel src 2000::1 dst \
    2000::2 proto gre
  # ip xfrm sta deleteall
  Failed to send delete-all request
  : Operation not permitted

Note that the xsinfo->proto in common states can never be IPPROTO_IPV6.

Fixes: f9d696cf414c ("xfrm: not try to delete ipcomp states when using deleteall")
Reported-by: Xiumei Mu <xmu@redhat.com>
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Andrea Claudi <aclaudi@redhat.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/ip/xfrm_state.c b/ip/xfrm_state.c
index d68f600ae700bc3aa123aa45a125de97c0799e88..f4bf3356bb01f67dc0f92f46a6db83c99116bab6 100644 (file)
--- a/ip/xfrm_state.c
+++ b/ip/xfrm_state.c
@@ -1131,7 +1131,8 @@ static int xfrm_state_keep(struct nlmsghdr *n, void *arg)
        if (!xfrm_state_filter_match(xsinfo))
                return 0;
 
-       if (xsinfo->id.proto == IPPROTO_IPIP)
+       if (xsinfo->id.proto == IPPROTO_IPIP ||
+           xsinfo->id.proto == IPPROTO_IPV6)
                return 0;
 
        if (xb->offset > xb->size) {