Commit b560f03d authored by David Barroso's avatar David Barroso Committed by David S. Miller

neigh: Explicitly declare RCU-bh read side critical section in neigh_xmit()

neigh_xmit() expects to be called inside an RCU-bh read side critical
section, and while one of its two current callers gets this right, the
other one doesn't.

More specifically, neigh_xmit() has two callers, mpls_forward() and
mpls_output(), and while both callers call neigh_xmit() under
rcu_read_lock(), this provides sufficient protection for neigh_xmit()
only in the case of mpls_forward(), as that is always called from
softirq context and therefore doesn't need explicit BH protection,
while mpls_output() can be called from process context with softirqs
enabled.

When mpls_output() is called from process context, with softirqs
enabled, we can be preempted by a softirq at any time, and RCU-bh
considers the completion of a softirq as signaling the end of any
pending read-side critical sections, so if we do get a softirq
while we are in the part of neigh_xmit() that expects to be run inside
an RCU-bh read side critical section, we can end up with an unexpected
RCU grace period running right in the middle of that critical section,
making things go boom.

This patch fixes this impedance mismatch in the callee, by making
neigh_xmit() always take rcu_read_{,un}lock_bh() around the code that
expects to be treated as an RCU-bh read side critical section, as this
seems a safer option than fixing it in the callers.

Fixes: 4fd3d7d9 ("neigh: Add helper function neigh_xmit")
Signed-off-by: default avatarDavid Barroso <dbarroso@fastly.com>
Signed-off-by: default avatarLennert Buytenhek <lbuytenhek@fastly.com>
Acked-by: default avatarDavid Ahern <dsa@cumulusnetworks.com>
Acked-by: default avatarRobert Shearman <rshearma@brocade.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 889ad456
...@@ -2469,13 +2469,17 @@ int neigh_xmit(int index, struct net_device *dev, ...@@ -2469,13 +2469,17 @@ int neigh_xmit(int index, struct net_device *dev,
tbl = neigh_tables[index]; tbl = neigh_tables[index];
if (!tbl) if (!tbl)
goto out; goto out;
rcu_read_lock_bh();
neigh = __neigh_lookup_noref(tbl, addr, dev); neigh = __neigh_lookup_noref(tbl, addr, dev);
if (!neigh) if (!neigh)
neigh = __neigh_create(tbl, addr, dev, false); neigh = __neigh_create(tbl, addr, dev, false);
err = PTR_ERR(neigh); err = PTR_ERR(neigh);
if (IS_ERR(neigh)) if (IS_ERR(neigh)) {
rcu_read_unlock_bh();
goto out_kfree_skb; goto out_kfree_skb;
}
err = neigh->output(neigh, skb); err = neigh->output(neigh, skb);
rcu_read_unlock_bh();
} }
else if (index == NEIGH_LINK_TABLE) { else if (index == NEIGH_LINK_TABLE) {
err = dev_hard_header(skb, dev, ntohs(skb->protocol), err = dev_hard_header(skb, dev, ntohs(skb->protocol),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment