linux-stable.git/net/openvswitch, branch linux-3.19.y

openvswitch: Return vport module ref before destruction

2015-04-29T08:23:42+00:00

[ Upstream commit fa2d8ff4e3522b4e05f590575d3eb8087f3a8cdc ]

Return module reference before invoking the respective vport
->destroy() function. This is needed as ovs_vport_del() is not
invoked inside an RCU read side critical section so the kfree
can occur immediately before returning to ovs_vport_del().

Returning the module reference before ->destroy() is safe because
the module unregistration is blocked on ovs_lock which we hold
while destroying the datapath.

Fixes: 62b9c8d0372d ("ovs: Turn vports with dependencies into separate modules")
Reported-by: Pravin Shelar 
Signed-off-by: Thomas Graf 
Acked-by: Pravin B Shelar 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

openvswitch: Fix net exit.

2015-03-18T13:10:49+00:00

[ Upstream commit 7b4577a9da3702049650f7095506e9afd9f68849 ]

Open vSwitch allows moving internal vport to different namespace
while still connected to the bridge. But when namespace deleted
OVS does not detach these vports, that results in dangling
pointer to netdevice which causes kernel panic as follows.
This issue is fixed by detaching all ovs ports from the deleted
namespace at net-exit.

BUG: unable to handle kernel NULL pointer dereference at 0000000000000028
IP: [] ovs_vport_locate+0x35/0x80 [openvswitch]
Oops: 0000 [#1] SMP
Call Trace:
 [] lookup_vport+0x21/0xd0 [openvswitch]
 [] ovs_vport_cmd_get+0x59/0xf0 [openvswitch]
 [] genl_family_rcv_msg+0x1bc/0x3e0
 [] genl_rcv_msg+0x79/0xc0
 [] netlink_rcv_skb+0xb9/0xe0
 [] genl_rcv+0x2c/0x40
 [] netlink_unicast+0x12d/0x1c0
 [] netlink_sendmsg+0x34a/0x6b0
 [] sock_sendmsg+0xa0/0xe0
 [] ___sys_sendmsg+0x408/0x420
 [] __sys_sendmsg+0x51/0x90
 [] SyS_sendmsg+0x12/0x20
 [] system_call_fastpath+0x12/0x17

Reported-by: Assaf Muller 
Fixes: 46df7b81454("openvswitch: Add support for network namespaces.")
Signed-off-by: Pravin B Shelar 
Reviewed-by: Thomas Graf 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

openvswitch: packet messages need their own probe attribtue

2015-01-14T21:49:44+00:00

User space is currently sending a OVS_FLOW_ATTR_PROBE for both flow
and packet messages. This leads to an out-of-bounds access in
ovs_packet_cmd_execute() because OVS_FLOW_ATTR_PROBE >
OVS_PACKET_ATTR_MAX.

Introduce a new OVS_PACKET_ATTR_PROBE with the same numeric value
as OVS_FLOW_ATTR_PROBE to grow the range of accepted packet attributes
while maintaining to be binary compatible with existing OVS binaries.

Fixes: 05da589 ("openvswitch: Add support for OVS_FLOW_ATTR_PROBE.")
Reported-by: Sander Eikelenboom 
Tracked-down-by: Florian Westphal 
Signed-off-by: Thomas Graf 
Reviewed-by: Jesse Gross 
Acked-by: Pravin B Shelar 
Signed-off-by: David S. Miller

openvswitch: Consistently include VLAN header in flow and port stats.

2015-01-02T21:14:20+00:00

Until now, when VLAN acceleration was in use, the bytes of the VLAN header
were not included in port or flow byte counters.  They were however
included when VLAN acceleration was not used.  This commit corrects the
inconsistency, by always including the VLAN header in byte counters.

Previous discussion at
http://openvswitch.org/pipermail/dev/2014-December/049521.html

Reported-by: Motonori Shindo 
Signed-off-by: Ben Pfaff 
Reviewed-by: Flavio Leitner 
Acked-by: Pravin B Shelar 
Signed-off-by: David S. Miller

genetlink: pass only network namespace to genl_has_listeners()

2014-12-27T07:20:23+00:00

There's no point to force the caller to know about the internal
genl_sock to use inside struct net, just have them pass the network
namespace. This doesn't really change code generation since it's
an inline, but makes the caller less magic - there's never any
reason to pass another socket.

Signed-off-by: Johannes Berg 
Signed-off-by: David S. Miller

openvswitch: fix odd_ptr_err.cocci warnings

2014-12-24T20:18:09+00:00

net/openvswitch/vport-gre.c:188:5-11: inconsistent IS_ERR and PTR_ERR, PTR_ERR on line 189

 PTR_ERR should access the value just tested by IS_ERR

Semantic patch information:
 There can be false positives in the patch case, where it is the call
 IS_ERR that is wrong.

Generated by: scripts/coccinelle/tests/odd_ptr_err.cocci

CC: Pravin B Shelar 
Signed-off-by: Fengguang Wu 
Acked-by: Pravin B Shelar 
Signed-off-by: David S. Miller

openvswitch: Fix vport_send double free

2014-12-24T04:57:31+00:00

Today vport-send has complex error handling because it involves
freeing skb and updating stats depending on return value from
vport send implementation.
This can be simplified by delegating responsibility of freeing
skb to the vport implementation for all cases. So that
vport-send needs just update stats.

Fixes: 91b7514cdf ("openvswitch: Unify vport error stats
handling")
Signed-off-by: Pravin B Shelar 
Signed-off-by: David S. Miller

openvswitch: Fix GSO with multiple MPLS label.

2014-12-24T04:57:31+00:00

MPLS GSO needs to know inner most protocol to process GSO packets.

Fixes: 25cd9ba0abc ("openvswitch: Add basic MPLS support to
kernel").

Signed-off-by: Pravin B Shelar 
Signed-off-by: David S. Miller

openvswitch: Fix MPLS action validation.

2014-12-24T04:57:31+00:00

Linux stack does not implement GSO for packet with multiple
encapsulations.  Therefore there was check in MPLS action
validation to detect such case, But this check introduced
bug which deleted one or more actions from actions list.
Following patch removes this check to fix the validation.

Fixes: 25cd9ba0abc ("openvswitch: Add basic MPLS support to
kernel").

Signed-off-by: Pravin B Shelar 
Reported-by: Srinivas Neginhal 
Acked-by: Jarno Rajahalme 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-12-10T20:48:20+00:00

Conflicts:
	drivers/net/ethernet/amd/xgbe/xgbe-desc.c
	drivers/net/ethernet/renesas/sh_eth.c

Overlapping changes in both conflict cases.

Signed-off-by: David S. Miller