Skip to content

Commit

Permalink
Revert "datapath: Avoid null deref when GSO is for verifying header i…
Browse files Browse the repository at this point in the history
…ntegrity only."

This reverts commit 00c7faf.

In general, it should not be possible have a NULL return value from
skb_gso_segment() since we're not actually trying to verify the
header integrity.  No other callers with similar needs have NULL
checks.  The actual cause of the problem was LRO packets, which
OVS isn't equipped to handle.  The commit
33e031e (datapath: Move LRO check
from transmit to receive.) solves that problem by fixing the LRO
check.  In order to avoid possibly masking any other problems, this
reverts the GSO check which should no longer be needed.

Signed-off-by: Jesse Gross <[email protected]>
  • Loading branch information
jessegross committed Jan 21, 2013
1 parent 33e031e commit d561983
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions datapath/datapath.c
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,6 @@ static int queue_gso_packets(struct net *net, int dp_ifindex,
segs = skb_gso_segment(skb, NETIF_F_SG | NETIF_F_HW_CSUM);
if (IS_ERR(segs))
return PTR_ERR(segs);
if (!segs)
return queue_userspace_packet(net, dp_ifindex, skb, upcall_info);

/* Queue all of the segments. */
skb = segs;
Expand Down

0 comments on commit d561983

Please sign in to comment.