diff options
| author | Haishuang Yan <yanhaishuang@cmss.chinamobile.com> | 2018-09-14 12:26:47 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-16 15:32:59 -0700 |
| commit | b0350d51f001e6edc13ee4f253b98b50b05dd401 (patch) | |
| tree | 004ac6f76db27619669e99ecec2138db92500fee /net/ipv4/gre_demux.c | |
| parent | 21e65923abaa8f64e1f12491b2c5a8c208f9cfe3 (diff) | |
| download | linux-b0350d51f001e6edc13ee4f253b98b50b05dd401.tar.bz2 | |
ip_gre: fix parsing gre header in ipgre_err
gre_parse_header stops parsing when csum_err is encountered, which means
tpi->key is undefined and ip_tunnel_lookup will return NULL improperly.
This patch introduce a NULL pointer as csum_err parameter. Even when
csum_err is encountered, it won't return error and continue parsing gre
header as expected.
Fixes: 9f57c67c379d ("gre: Remove support for sharing GRE protocol hook.")
Reported-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/gre_demux.c')
| -rw-r--r-- | net/ipv4/gre_demux.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv4/gre_demux.c b/net/ipv4/gre_demux.c index b798862b6be5..7efe740c06eb 100644 --- a/net/ipv4/gre_demux.c +++ b/net/ipv4/gre_demux.c @@ -86,13 +86,14 @@ int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi, options = (__be32 *)(greh + 1); if (greh->flags & GRE_CSUM) { - if (skb_checksum_simple_validate(skb)) { + if (!skb_checksum_simple_validate(skb)) { + skb_checksum_try_convert(skb, IPPROTO_GRE, 0, + null_compute_pseudo); + } else if (csum_err) { *csum_err = true; return -EINVAL; } - skb_checksum_try_convert(skb, IPPROTO_GRE, 0, - null_compute_pseudo); options++; } |