netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Steffen Klassert <steffen.klassert@secunet.com>
To: David Miller <davem@davemloft.net>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
	Steffen Klassert <steffen.klassert@secunet.com>,
	<netdev@vger.kernel.org>
Subject: [PATCH 3/5] xfrm: Reset encapsulation field of the skb before transformation
Date: Thu, 10 Mar 2016 11:24:27 +0100	[thread overview]
Message-ID: <1457605469-17332-4-git-send-email-steffen.klassert@secunet.com> (raw)
In-Reply-To: <1457605469-17332-1-git-send-email-steffen.klassert@secunet.com>

The inner headers are invalid after a xfrm transformation.
So reset the skb encapsulation field to ensure nobody tries
to access the inner headers.

Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---
 net/xfrm/xfrm_output.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index ff4a91f..637387b 100644
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -99,6 +99,9 @@ static int xfrm_output_one(struct sk_buff *skb, int err)
 
 		skb_dst_force(skb);
 
+		/* Inner headers are invalid now. */
+		skb->encapsulation = 0;
+
 		err = x->type->output(x, skb);
 		if (err == -EINPROGRESS)
 			goto out;
-- 
1.9.1

  parent reply	other threads:[~2016-03-10 10:54 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-10 10:24 pull request (net): ipsec 2016-03-10 Steffen Klassert
2016-03-10 10:24 ` [PATCH 1/5] vti: Add pmtu handling to vti_xmit Steffen Klassert
2016-03-10 10:24 ` [PATCH 2/5] flowcache: Avoid OOM condition under preasure Steffen Klassert
2016-03-10 10:24 ` Steffen Klassert [this message]
2016-03-10 10:24 ` [PATCH 4/5] vti6: Fix dst_entry leek on pmtu discovery Steffen Klassert
2016-03-10 13:52   ` Sergei Shtylyov
2016-03-10 10:24 ` [PATCH 5/5] vti: Fix recource leeks " Steffen Klassert
2016-03-10 13:53   ` Sergei Shtylyov
2016-03-14 19:21 ` pull request (net): ipsec 2016-03-10 David Miller
2016-03-15  6:59   ` Steffen Klassert

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=1457605469-17332-4-git-send-email-steffen.klassert@secunet.com \
    --to=steffen.klassert@secunet.com \
    --cc=davem@davemloft.net \
    --cc=herbert@gondor.apana.org.au \
    --cc=netdev@vger.kernel.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).