]> asedeno.scripts.mit.edu Git - linux.git/commit
ip_gre: fix parsing gre header in ipgre_err
authorHaishuang Yan <yanhaishuang@cmss.chinamobile.com>
Fri, 14 Sep 2018 04:26:47 +0000 (12:26 +0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 16 Sep 2018 22:32:59 +0000 (15:32 -0700)
commitb0350d51f001e6edc13ee4f253b98b50b05dd401
tree004ac6f76db27619669e99ecec2138db92500fee
parent21e65923abaa8f64e1f12491b2c5a8c208f9cfe3
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>
net/ipv4/gre_demux.c
net/ipv4/ip_gre.c