From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
To: stable <stable@vger.kernel.org>, netdev <netdev@vger.kernel.org>,
Sasha Levin <sasha.levin@oracle.com>
Cc: David Miller <davem@davemloft.net>,
Alexander Duyck <alexander.h.duyck@redhat.com>,
Steffen Klassert <steffen.klassert@secunet.com>
Subject: [v3.18] Fixes for ip_vti and ip6_vti
Date: Tue, 25 Aug 2015 15:21:19 +0200 [thread overview]
Message-ID: <55DC6BCF.1040206@6wind.com> (raw)
Hi,
since commit ca7c7b9059e3 ("skbuff: Do not scrub skb mark within the same name
space", backport of upstream commit 213dd74aee76), the following three upstream
commits need also to be backported in the 3.18 branch:
- cd5279c194f8 ("ip_vti/ip6_vti: Do not touch skb->mark on xmit")
- 049f8e2e28d9 ("xfrm: Override skb->mark with tunnel->parm.i_key in
xfrm_input")
- d55c670cbc54 ("ip_vti/ip6_vti: Preserve skb->mark after rcv_cb call")
When the packet is handled by the ip_vti interface, it is temporarily marked
with the ip_vti interface key. Once the process is completed, the packet is
received via the ip_vti interface and its original mark should be restored
(typically to 0).
Before the backported patch, ip_vti counted on skb_scrub_packet to reset the
mark, but skb_scrub_packet nomore does.
Since the packet is still marked, it will match the outbound SP and so be
encrypted again.
Regards,
Nicolas
reply other threads:[~2015-08-25 13:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=55DC6BCF.1040206@6wind.com \
--to=nicolas.dichtel@6wind.com \
--cc=alexander.h.duyck@redhat.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=sasha.levin@oracle.com \
--cc=stable@vger.kernel.org \
--cc=steffen.klassert@secunet.com \
/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).