]> git.baikalelectronics.ru Git - kernel.git/commit
neigh: Explicitly declare RCU-bh read side critical section in neigh_xmit()
authorDavid Barroso <dbarroso@fastly.com>
Tue, 28 Jun 2016 08:16:43 +0000 (11:16 +0300)
committerDavid S. Miller <davem@davemloft.net>
Wed, 29 Jun 2016 11:58:28 +0000 (07:58 -0400)
commit9cda6a920112ebd3c67d0b7e2d22d8cae387de4d
tree03bf25ae415a6a6a43e07d4ad739c1fbe5bd2582
parent5906b6164cef5d6edce8ce2976bbf6305331a4bd
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: 670b3fc1a247d ("neigh: Add helper function neigh_xmit")
Signed-off-by: David Barroso <dbarroso@fastly.com>
Signed-off-by: Lennert Buytenhek <lbuytenhek@fastly.com>
Acked-by: David Ahern <dsa@cumulusnetworks.com>
Acked-by: Robert Shearman <rshearma@brocade.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/neighbour.c