diff options
| author | Xin Long <lucien.xin@gmail.com> | 2017-09-15 12:00:07 +0800 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2019-05-02 16:59:40 +0200 |
| commit | 73b6968927a070042578b9a2803527739533f844 (patch) | |
| tree | 2676b182f2be6e3828609a73a242d91ae181248f /kernel/debug | |
| parent | 5eb74d36b399a14050a108cac44d3046d79e2d59 (diff) | |
ip6_gre: skb_push ipv6hdr before packing the header in ip6gre_header
commit 76cc0d3282d4b933fa144fa41fbc5318e0fdca24 upstream.
Now in ip6gre_header before packing the ipv6 header, it skb_push t->hlen
which only includes encap_hlen + tun_hlen. It means greh and inner header
would be over written by ipv6 stuff and ipv6h might have no chance to set
up.
Jianlin found this issue when using remote any on ip6_gre, the packets he
captured on gre dev are truncated:
22:50:26.210866 Out ethertype IPv6 (0x86dd), length 120: truncated-ip6 -\
8128 bytes missing!(flowlabel 0x92f40, hlim 0, next-header Options (0) \
payload length: 8192) ::1:2000:0 > ::1:0:86dd: HBH [trunc] ip-proto-128 \
8184
It should also skb_push ipv6hdr so that ipv6h points to the right position
to set ipv6 stuff up.
This patch is to skb_push hlen + sizeof(*ipv6h) and also fix some indents
in ip6gre_header.
Fixes: c12b395a4664 ("gre: Support GRE over IPv6")
Change-Id: I2955a306d3b4c7d0378eb1745f749dbed5b4008d
Reported-by: Jianlin Shi <jishi@redhat.com>
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'kernel/debug')
0 files changed, 0 insertions, 0 deletions