diff options
| author | Jesse Gross <jesse@nicira.com> | 2013-01-21 23:57:26 -0800 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2013-01-21 23:57:26 -0800 |
| commit | d9d59089c43fc33eb403cbb928e56c131f191dd5 (patch) | |
| tree | 18c2d4b631048d1bbee5cbf12c84d8034fe1a1e7 /net | |
| parent | a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565 (diff) | |
| download | linux-d9d59089c43fc33eb403cbb928e56c131f191dd5.tar.gz linux-d9d59089c43fc33eb403cbb928e56c131f191dd5.tar.bz2 linux-d9d59089c43fc33eb403cbb928e56c131f191dd5.zip | |
openvswitch: Move LRO check from transmit to receive.
The check for LRO packets was incorrectly put in the transmit path
instead of on receive. Since this check is supposed to protect OVS
(and other parts of the system) from packets that it cannot handle
it is obviously not useful on egress. Therefore, this commit moves
it back to the receive side.
The primary problem that this caused is upcalls to userspace tried
to segment the packet even though no segmentation information is
available. This would later cause NULL pointer dereferences when
skb_gso_segment() did nothing.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/openvswitch/vport-netdev.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/net/openvswitch/vport-netdev.c b/net/openvswitch/vport-netdev.c index a9327e2e48ce..670cbc3518de 100644 --- a/net/openvswitch/vport-netdev.c +++ b/net/openvswitch/vport-netdev.c @@ -35,10 +35,11 @@ /* Must be called with rcu_read_lock. */ static void netdev_port_receive(struct vport *vport, struct sk_buff *skb) { - if (unlikely(!vport)) { - kfree_skb(skb); - return; - } + if (unlikely(!vport)) + goto error; + + if (unlikely(skb_warn_if_lro(skb))) + goto error; /* Make our own copy of the packet. Otherwise we will mangle the * packet for anyone who came before us (e.g. tcpdump via AF_PACKET). @@ -50,6 +51,10 @@ static void netdev_port_receive(struct vport *vport, struct sk_buff *skb) skb_push(skb, ETH_HLEN); ovs_vport_receive(vport, skb); + return; + +error: + kfree_skb(skb); } /* Called with rcu_read_lock and bottom-halves disabled. */ @@ -169,9 +174,6 @@ static int netdev_send(struct vport *vport, struct sk_buff *skb) goto error; } - if (unlikely(skb_warn_if_lro(skb))) - goto error; - skb->dev = netdev_vport->dev; len = skb->len; dev_queue_xmit(skb); |