netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Egerer <thomas.egerer@secunet.com>
To: Stephen Hemminger <stephen@networkplumber.org>
Cc: <netdev@vger.kernel.org>
Subject: [PATCH iproute2-resend 2/3] xfrm_policy: Do not attempt to deleteall a socket policy
Date: Thu, 2 Nov 2017 14:13:25 +0100	[thread overview]
Message-ID: <5e5afcd7-eaa3-6ba1-803d-722ac9535bf4@secunet.com> (raw)
In-Reply-To: <20171101220508.5be2176f@shemminger-XPS-13-9360>

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>
---
 ip/xfrm_policy.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ip/xfrm_policy.c b/ip/xfrm_policy.c
index 7d2139e..e2fa771 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;
 
-- 
2.6.4

  parent reply	other threads:[~2017-11-02 13:14 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-30 18:11 [PATCH iproute2 3/3] xfrm_{state,policy}: Allow to deleteall polices/states with marks Thomas Egerer
2017-10-31 17:13 ` Stephen Hemminger
2017-11-01  9:52   ` Thomas Egerer
2017-11-01 21:05     ` Stephen Hemminger
2017-11-02 13:13       ` [PATCH iproute2-resend 0/3] *** SUBJECT HERE *** Thomas Egerer
2017-11-07  2:14         ` Stephen Hemminger
2017-11-02 13:13       ` [PATCH iproute2-resend 1/3] xfrm_policy: Add filter option for socket policies Thomas Egerer
2017-11-02 13:13       ` Thomas Egerer [this message]
2017-11-02 13:13       ` [PATCH iproute2-resend 3/3] xfrm_{state,policy}: Allow to deleteall polices/states with marks Thomas Egerer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5e5afcd7-eaa3-6ba1-803d-722ac9535bf4@secunet.com \
    --to=thomas.egerer@secunet.com \
    --cc=netdev@vger.kernel.org \
    --cc=stephen@networkplumber.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).