linux.git/net/openvswitch, branch v3.17-rc2

openvswitch: fix panic with multiple vlan headers

2014-08-22T18:24:04+00:00

When there are multiple vlan headers present in a received frame, the first
one is put into vlan_tci and protocol is set to ETH_P_8021Q. Anything in the
skb beyond the VLAN TPID may be still non-linear, including the inner TCI
and ethertype. While ovs_flow_extract takes care of IP and IPv6 headers, it
does nothing with ETH_P_8021Q. Later, if OVS_ACTION_ATTR_POP_VLAN is
executed, __pop_vlan_tci pulls the next vlan header into vlan_tci.

This leads to two things:

1. Part of the resulting ethernet header is in the non-linear part of the
   skb. When eth_type_trans is called later as the result of
   OVS_ACTION_ATTR_OUTPUT, kernel BUGs in __skb_pull. Also, __pop_vlan_tci
   is in fact accessing random data when it reads past the TPID.

2. network_header points into the ethernet header instead of behind it.
   mac_len is set to a wrong value (10), too.

Reported-by: Yulong Pei 
Signed-off-by: Jiri Benc 
Signed-off-by: David S. Miller

openvswitch: Fix memory leak in ovs_vport_alloc() error path

2014-08-14T03:04:46+00:00

ovs_vport_alloc() bails out without freeing the memory 'vport' points to.

Picked up by Coverity - CID 1230503.

Fixes: 5cd667b0a4 ("openvswitch: Allow each vport to have an array of 'port_id's.")
Signed-off-by: Christoph Jaeger 
Signed-off-by: David S. Miller

openvswitch: fix duplicate #include headers

2014-08-07T23:02:57+00:00

The #include headers net/genetlink.h and linux/genetlink.h both were
included twice, so delete each of the duplicate.

Signed-off-by: Jean Sacren 
Cc: Pravin Shelar 
Cc: dev@openvswitch.org
Signed-off-by: David S. Miller

net: Remove unlikely() for WARN_ON() conditions

2014-07-31T00:41:47+00:00

No need for the unlikely(), WARN_ON() and BUG_ON() internally use
unlikely() on the condition.

Signed-off-by: Thomas Graf 
Signed-off-by: David S. Miller

openvswitch: Use IS_ERR_OR_NULL

2014-07-29T22:31:56+00:00

This patch introduces the use of the macro IS_ERR_OR_NULL in place of
tests for NULL and IS_ERR.

The following Coccinelle semantic patch was used for making the change:

@@
expression e;
@@

- e == NULL || IS_ERR(e)
+ IS_ERR_OR_NULL(e)
 || ...

Signed-off-by: Himangi Saraogi 
Acked-by: Julia Lawall 
Acked-by: Pravin B Shelar 
Signed-off-by: David S. Miller

openvswitch: Add skb_clone NULL check for the sampling action.

2014-07-24T16:37:22+00:00

Fix a bug where skb_clone() NULL check is missing in sample action
implementation.

Signed-off-by: Andy Zhou 
Signed-off-by: Pravin B Shelar

openvswitch: Sample action without side effects

2014-07-24T16:37:21+00:00

The sample action is rather generic, allowing arbitrary actions to be
executed based on a probability. However its use, within the Open
vSwitch
code-base is limited: only a single user-space action is ever nested.

A consequence of the current implementation of sample actions is that
depending on weather the sample action executed (due to its probability)
any side-effects of nested actions may or may not be present before
executing subsequent actions.  This has the potential to complicate
verification of valid actions by the (kernel) datapath. And indeed
adding support for push and pop MPLS actions inside sample actions
is one case where such case.

In order to allow all supported actions to be continue to be nested
inside sample actions without the potential need for complex
verification code this patch changes the implementation of the sample
action in the kernel datapath so that sample actions are more like
a function call and any side effects of nested actions are not
present when executing subsequent actions.

With the above in mind the motivation for this change is twofold:

* To contain side-effects the sample action in the hope of making it
  easier to deal with in the future and;
* To avoid some rather complex verification code introduced in the MPLS
  datapath patch.

Signed-off-by: Simon Horman 
Signed-off-by: Jesse Gross 
Signed-off-by: Pravin B Shelar

openvswitch: Avoid memory corruption in queue_userspace_packet()

2014-07-24T16:37:20+00:00

In queue_userspace_packet(), the ovs_nla_put_flow return value is
not checked. This is fine as long as key_attr_size() returns the
correct value. In case it does not, the current code may corrupt buffer
memory. Add a run time assertion catch this case to avoid silent
failure.

Reported-by: Ben Pfaff 
Signed-off-by: Andy Zhou 
Signed-off-by: Pravin B Shelar

openvswitch: Enable tunnel GSO for OVS bridge.

2014-07-24T08:15:04+00:00

Following patch enables all available tunnel GSO features for OVS
bridge device so that ovs can use hardware offloads available to
underling device.

Signed-off-by: Pravin B Shelar 
Acked-by: Andy Zhou

openvswitch: Allow each vport to have an array of 'port_id's.

2014-07-24T08:15:04+00:00

In order to allow handlers directly read upcalls from datapath,
we need to support per-handler netlink socket for each vport in
datapath.  This commit makes this happen.  Also, it is guaranteed
to be backward compatible with previous branch.

Signed-off-by: Alex Wang 
Acked-by: Thomas Graf 
Signed-off-by: Pravin B Shelar