Message ID | 20201226234453.905884-1-xiyou.wangcong@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net] erspan: fix version 1 check in gre_parse_header() | expand |
Context | Check | Description |
---|---|---|
netdev/cover_letter | success | Link |
netdev/fixes_present | success | Link |
netdev/patch_count | success | Link |
netdev/tree_selection | success | Clearly marked for net |
netdev/subject_prefix | success | Link |
netdev/cc_maintainers | warning | 5 maintainers not CCed: davem@davemloft.net xeb@mail.ru kuznet@ms2.inr.ac.ru yoshfuji@linux-ipv6.org kuba@kernel.org |
netdev/source_inline | success | Was 0 now: 0 |
netdev/verify_signedoff | success | Link |
netdev/module_param | success | Was 0 now: 0 |
netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
netdev/verify_fixes | success | Link |
netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 8 lines checked |
netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
netdev/header_inline | success | Link |
netdev/stable | success | Stable not CCed |
From: Cong Wang <xiyou.wangcong@gmail.com> Date: Sat, 26 Dec 2020 15:44:53 -0800 > From: Cong Wang <cong.wang@bytedance.com> > > 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> Applied and queued up for -stable, thanks.
diff --git a/net/ipv4/gre_demux.c b/net/ipv4/gre_demux.c index 66fdbfe5447c..5d1e6fe9d838 100644 --- a/net/ipv4/gre_demux.c +++ b/net/ipv4/gre_demux.c @@ -128,7 +128,7 @@ int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi, * to 0 and sets the configured key in the * inner erspan header field */ - if (greh->protocol == htons(ETH_P_ERSPAN) || + if ((greh->protocol == htons(ETH_P_ERSPAN) && hdr_len != 4) || greh->protocol == htons(ETH_P_ERSPAN2)) { struct erspan_base_hdr *ershdr;