]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
erspan: fix version 1 check in gre_parse_header()
authorCong Wang <cong.wang@bytedance.com>
Sat, 26 Dec 2020 23:44:53 +0000 (15:44 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 12 Jan 2021 19:16:15 +0000 (20:16 +0100)
commit2b8aa896b151473d7f661ca5e8a2fecb7c737676
tree55b832035240194d7fa58e79379aa14292881328
parent606f5412ad86065af6d696f48dc58dab32700e87
erspan: fix version 1 check in gre_parse_header()

[ Upstream commit 085c7c4e1c0e50d90b7d90f61a12e12b317a91e2 ]

Both version 0 and version 1 use ETH_P_ERSPAN, but version 0 does not
have an erspan header. So the check in gre_parse_header() is wrong,
we have to distinguish version 1 from version 0.

We can just check the gre header length like is_erspan_type1().

Fixes: cb73ee40b1b3 ("net: ip_gre: use erspan key field for tunnel lookup")
Reported-by: syzbot+f583ce3d4ddf9836b27a@syzkaller.appspotmail.com
Cc: William Tu <u9012063@gmail.com>
Cc: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Cong Wang <cong.wang@bytedance.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/ipv4/gre_demux.c