]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
ip_gre: add validation for csum_start
authorShreyansh Chouhan <chouhan.shreyansh630@gmail.com>
Sat, 21 Aug 2021 07:14:24 +0000 (12:44 +0530)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 1 Oct 2021 09:31:05 +0000 (11:31 +0200)
BugLink: https://bugs.launchpad.net/bugs/1944756
[ Upstream commit 1d011c4803c72f3907eccfc1ec63caefb852fcbf ]

Validate csum_start in gre_handle_offloads before we call _gre_xmit so
that we do not crash later when the csum_start value is used in the
lco_csum function call.

This patch deals with ipv4 code.

Fixes: c54419321455 ("GRE: Refactor GRE tunneling code.")
Reported-by: syzbot+ff8e1b9f2f36481e2efc@syzkaller.appspotmail.com
Signed-off-by: Shreyansh Chouhan <chouhan.shreyansh630@gmail.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
net/ipv4/ip_gre.c

index fedad3a3e61b84023982275a353e98810e911f48..fd8298b8b1c520a0a815232e7a0b63049db87a79 100644 (file)
@@ -446,6 +446,8 @@ static void __gre_xmit(struct sk_buff *skb, struct net_device *dev,
 
 static int gre_handle_offloads(struct sk_buff *skb, bool csum)
 {
+       if (csum && skb_checksum_start(skb) < skb->data)
+               return -EINVAL;
        return iptunnel_handle_offloads(skb, csum ? SKB_GSO_GRE_CSUM : SKB_GSO_GRE);
 }