| Message ID | 267328222f0a11519c6de04c640a4f87a38ea9ed.1726046181.git.gnault@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c471236b2359e6b27388475dd04fff0a5e2bf922 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | bareudp: Pull inner IP header on xmit/recv. | expand |
Guillaume Nault wrote: > Both bareudp_xmit_skb() and bareudp6_xmit_skb() read their skb's inner > IP header to get its ECN value (with ip_tunnel_ecn_encap()). Therefore > we need to ensure that the inner IP header is part of the skb's linear > data. > > Fixes: 571912c69f0e ("net: UDP tunnel encapsulation module for tunnelling different protocols like MPLS, IP, NSH etc.") > Signed-off-by: Guillaume Nault <gnault@redhat.com> Reviewed-by: Willem de Bruijn <willemb@google.com>
diff --git a/drivers/net/bareudp.c b/drivers/net/bareudp.c index b4e820a123ca..e80992b4f9de 100644 --- a/drivers/net/bareudp.c +++ b/drivers/net/bareudp.c @@ -317,6 +317,9 @@ static int bareudp_xmit_skb(struct sk_buff *skb, struct net_device *dev, __be32 saddr; int err; + if (!skb_vlan_inet_prepare(skb, skb->protocol != htons(ETH_P_TEB))) + return -EINVAL; + if (!sock) return -ESHUTDOWN; @@ -384,6 +387,9 @@ static int bareudp6_xmit_skb(struct sk_buff *skb, struct net_device *dev, __be16 sport; int err; + if (!skb_vlan_inet_prepare(skb, skb->protocol != htons(ETH_P_TEB))) + return -EINVAL; + if (!sock) return -ESHUTDOWN;
Both bareudp_xmit_skb() and bareudp6_xmit_skb() read their skb's inner IP header to get its ECN value (with ip_tunnel_ecn_encap()). Therefore we need to ensure that the inner IP header is part of the skb's linear data. Fixes: 571912c69f0e ("net: UDP tunnel encapsulation module for tunnelling different protocols like MPLS, IP, NSH etc.") Signed-off-by: Guillaume Nault <gnault@redhat.com> --- v2: Add Fixes: tag. drivers/net/bareudp.c | 6 ++++++ 1 file changed, 6 insertions(+)