Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7654ebe authored by Cong Wang's avatar Cong Wang Committed by Greg Kroah-Hartman
Browse files

gre: refetch erspan header from skb->data after pskb_may_pull() 



[ Upstream commit 0e4940928c26527ce8f97237fef4c8a91cd34207 ]

After pskb_may_pull() we should always refetch the header
pointers from the skb->data in case it got reallocated.

In gre_parse_header(), the erspan header is still fetched
from the 'options' pointer which is fetched before
pskb_may_pull().

Found this during code review of a KMSAN bug report.

Fixes: cb73ee40b1b3 ("net: ip_gre: use erspan key field for tunnel lookup")
Cc: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Acked-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Acked-by: default avatarWilliam Tu <u9012063@gmail.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 4f579272

net/ipv4/gre_demux.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi, 
		if (!pskb_may_pull(skb, nhs + hdr_len + sizeof(*ershdr)))

			return -EINVAL;



		ershdr = (struct erspan_base_hdr *)options;

		ershdr = (struct erspan_base_hdr *)(skb->data + nhs + hdr_len);

		tpi->key = cpu_to_be32(get_session_id(ershdr));

	}