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

Commit c303aa94 authored by Jesse Gross's avatar Jesse Gross
Browse files

openvswitch: Fix FLOW_BUFSIZE definition. 



The vlan encapsulation fields in the maximum flow defintion were
never updated when the representation changed before upstreaming.
In theory this could cause a kernel panic when a maximum length
flow is used.  In practice this has never happened (to my knowledge)
because skb allocations are padded out to a cache line so you would
need the right combination of flow and packet being sent to userspace.

Signed-off-by: default avatarJesse Gross <jesse@nicira.com>
parent 39855b5b

net/openvswitch/flow.h

+5 −3
Original line number Diff line number Diff line
@@ -145,15 +145,17 @@ u64 ovs_flow_used_time(unsigned long flow_jiffies); 
 *  OVS_KEY_ATTR_PRIORITY      4    --     4      8

 *  OVS_KEY_ATTR_IN_PORT       4    --     4      8

 *  OVS_KEY_ATTR_ETHERNET     12    --     4     16

 *  OVS_KEY_ATTR_ETHERTYPE     2     2     4      8  (outer VLAN ethertype)

 *  OVS_KEY_ATTR_8021Q         4    --     4      8

 *  OVS_KEY_ATTR_ETHERTYPE     2     2     4      8

 *  OVS_KEY_ATTR_ENCAP         0    --     4      4  (VLAN encapsulation)

 *  OVS_KEY_ATTR_ETHERTYPE     2     2     4      8  (inner VLAN ethertype)

 *  OVS_KEY_ATTR_IPV6         40    --     4     44

 *  OVS_KEY_ATTR_ICMPV6        2     2     4      8

 *  OVS_KEY_ATTR_ND           28    --     4     32

 *  -------------------------------------------------

 *  total                                       132

 *  total                                       144

 */

#define FLOW_BUFSIZE 132

#define FLOW_BUFSIZE 144



int ovs_flow_to_nlattrs(const struct sw_flow_key *, struct sk_buff *);

int ovs_flow_from_nlattrs(struct sw_flow_key *swkey, int *key_lenp,