From: Ramesh Nagappa <[email protected]> The retry loop in neigh_resolve_output() and neigh_connected_output() call dev_hard_header() with out reseting the skb to network_header. This causes the retry to fail with skb_under_panic. The fix is to reset the network_header within the retry loop.
Signed-off-by: Ramesh Nagappa <[email protected]> Reviewed-by: Shawn Lu <[email protected]> Reviewed-by: Robert Coulson <[email protected]> Reviewed-by: Billie Alsup <[email protected]> --- net/core/neighbour.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 117afaf..f50c542 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -1313,6 +1313,7 @@ int neigh_resolve_output(struct neighbour *neigh, struct sk_buff *skb) do { seq = read_seqbegin(&neigh->ha_lock); + __skb_pull(skb, skb_network_offset(skb)); err = dev_hard_header(skb, dev, ntohs(skb->protocol), neigh->ha, NULL, skb->len); } while (read_seqretry(&neigh->ha_lock, seq)); @@ -1342,10 +1343,9 @@ int neigh_connected_output(struct neighbour *neigh, struct sk_buff *skb) unsigned int seq; int err; - __skb_pull(skb, skb_network_offset(skb)); - do { seq = read_seqbegin(&neigh->ha_lock); + __skb_pull(skb, skb_network_offset(skb)); err = dev_hard_header(skb, dev, ntohs(skb->protocol), neigh->ha, NULL, skb->len); } while (read_seqretry(&neigh->ha_lock, seq)); -- 1.7.11.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
