mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-29 15:28:56 +00:00
Code Issues Releases Wiki Activity

datapath: fix size of struct ovs_gso_cb

Browse Source 
struct ovs_gso_cb is stored in skb->cd. avoid going beyond size
of skb->cb.

Signed-off-by: Pravin B Shelar <pshelar@ovn.org>
Acked-by: Jesse Gross <jesse@kernel.org>
This commit is contained in:
Pravin B Shelar
2016-08-02 17:03:41 -07:00
parent 06478ca06a
commit dfe999407a
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
datapath/linux/compat/gso.c
View File

@@ -171,6 +171,7 @@ static struct sk_buff *tnl_skb_gso_segment(struct sk_buff *skb,
__be16 proto = skb->protocol; __be16 proto = skb->protocol;
char cb[sizeof(skb->cb)]; char cb[sizeof(skb->cb)];
BUILD_BUG_ON(sizeof(struct ovs_gso_cb) > FIELD_SIZEOF(struct sk_buff, cb));
OVS_GSO_CB(skb)->ipv6 = (sa_family == AF_INET6); OVS_GSO_CB(skb)->ipv6 = (sa_family == AF_INET6);
/* setup whole inner packet to get protocol. */ /* setup whole inner packet to get protocol. */
__skb_pull(skb, mac_offset); __skb_pull(skb, mac_offset);

2
datapath/linux/compat/gso.h
View File

@@ -14,6 +14,7 @@ struct ovs_gso_cb {
#ifndef USE_UPSTREAM_TUNNEL_GSO #ifndef USE_UPSTREAM_TUNNEL_GSO
gso_fix_segment_t fix_segment; gso_fix_segment_t fix_segment;
#endif #endif
bool ipv6;
#ifndef HAVE_INNER_PROTOCOL #ifndef HAVE_INNER_PROTOCOL
__be16 inner_protocol; __be16 inner_protocol;
#endif #endif
@@ -21,7 +22,6 @@ struct ovs_gso_cb {
/* Keep original tunnel info during userspace action execution. */ /* Keep original tunnel info during userspace action execution. */
struct metadata_dst *fill_md_dst; struct metadata_dst *fill_md_dst;
#endif #endif
bool ipv6;
}; };
#define OVS_GSO_CB(skb) ((struct ovs_gso_cb *)(skb)->cb) #define OVS_GSO_CB(skb) ((struct ovs_gso_cb *)(skb)->cb)