Guillaume Nault 0a0e1a85c8 ppp: fix xmit recursion detection on ppp channels ... Commit e5dadc65f9 ("ppp: Fix false xmit recursion detect with two ppp devices") dropped the xmit_recursion counter incrementation in ppp_channel_push() and relied on ppp_xmit_process() for this task. But __ppp_channel_push() can also send packets directly (using the .start_xmit() channel callback), in which case the xmit_recursion counter isn't incremented anymore. If such packets get routed back to the parent ppp unit, ppp_xmit_process() won't notice the recursion and will call ppp_channel_push() on the same channel, effectively creating the deadlock situation that the xmit_recursion mechanism was supposed to prevent. This patch re-introduces the xmit_recursion counter incrementation in ppp_channel_push(). Since the xmit_recursion variable is now part of the parent ppp unit, incrementation is skipped if the channel doesn't have any. This is fine because only packets routed through the parent unit may enter the channel recursively. Finally, we have to ensure that pch->ppp is not going to be modified while executing ppp_channel_push(). Instead of taking this lock only while calling ppp_xmit_process(), we now have to hold it for the full ppp_channel_push() execution. This respects the ppp locks ordering which requires locking ->upl before ->downl. Fixes: e5dadc65f9 ("ppp: Fix false xmit recursion detect with two ppp devices") Signed-off-by: Guillaume Nault <g.nault@alphalink.fr> Signed-off-by: David S. Miller <davem@davemloft.net>		2017-08-08 21:06:11 -07:00
..
bsd_comp.c
Kconfig
Makefile
ppp_async.c	networking: make skb_push & __skb_push return void pointers	2017-06-16 11:48:40 -04:00
ppp_deflate.c
ppp_generic.c	ppp: fix xmit recursion detection on ppp channels	2017-08-08 21:06:11 -07:00
ppp_mppe.c	ppp: mppe: Use vsnprintf extension %phN	2017-06-06 15:16:33 -04:00
ppp_mppe.h
ppp_synctty.c	net: manual clean code which call skb_put_[data:zero]	2017-06-20 13:30:15 -04:00
pppoe.c	networking: make skb_put & friends return void pointers	2017-06-16 11:48:39 -04:00
pppox.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
pptp.c	ppp: Fix a scheduling-while-atomic bug in del_chan	2017-07-31 21:59:01 -07:00