From: Thomas Egerer <thomas.egerer@secunet.com>
Date: Mon, 30 Oct 2017 18:11:45 +0000 (+0100)
Subject: xfrm_policy: Do not attempt to deleteall a socket policy
X-Git-Tag: v4.14.0~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5474d440b8a26b30104329d699217c87d34652ad;p=thirdparty%2Fiproute2.git

xfrm_policy: Do not attempt to deleteall a socket policy

Socket polices are added to a socket using setsockopt(2). They cannot be
deleted by iproute2. The attempt to delete them causes an error
(EINVAL).
To avoid this unnecessary error message all socket policies are skipped
in xfrm_policy_keep.

Signed-off-by: Thomas Egerer <thomas.egerer@secunet.com>
---

diff --git a/ip/xfrm_policy.c b/ip/xfrm_policy.c
index 0c86a52a7..e716a7d0f 100644
--- a/ip/xfrm_policy.c
+++ b/ip/xfrm_policy.c
@@ -735,6 +735,10 @@ static int xfrm_policy_keep(const struct sockaddr_nl *who,
 	if (!xfrm_policy_filter_match(xpinfo, ptype))
 		return 0;
 
+	/* can't delete socket policies */
+	if (xpinfo->dir >= XFRM_POLICY_MAX)
+		return 0;
+
 	if (xb->offset + NLMSG_LENGTH(sizeof(*xpid)) > xb->size)
 		return 0;