Prev: [093/117] tun: orphan an skb on tx
Next: [PATCH 06/10] perf/trace/scripting: workqueue-stats script cleanup
From: Greg KH on 10 May 2010 19:30
2.6.33-stable review patch. If anyone has any objections, please let us know.

------------------


From: Krzysztof Halasa <khc(a)pm.waw.pl>

[ Upstream commit 31f634a63de7068c6a5dcb0d7b09b24b61a5cf88 ]

tx_queue is used as a temporary queue when not allowed to queue skb
directly to the hw device driver (which may sleep). Most paths flush
it before returning, but ppp_start() currently cannot. Make sure we
don't leave skbs pointing to a non-existent device.

Thanks to Michael Barkowski for reporting this problem.

Signed-off-by: Krzysztof Hałasa <khc(a)pm.waw.pl>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>
---
drivers/net/wan/hdlc_ppp.c | 6 ++++++
1 file changed, 6 insertions(+)

--- a/drivers/net/wan/hdlc_ppp.c
+++ b/drivers/net/wan/hdlc_ppp.c
@@ -628,9 +628,15 @@ static void ppp_stop(struct net_device *
ppp_cp_event(dev, PID_LCP, STOP, 0, 0, 0, NULL);
}

+static void ppp_close(struct net_device *dev)
+{
+ ppp_tx_flush();
+}
+
static struct hdlc_proto proto = {
.start = ppp_start,
.stop = ppp_stop,
+ .close = ppp_close,
.type_trans = ppp_type_trans,
.ioctl = ppp_ioctl,
.netif_rx = ppp_rx,


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [093/117] tun: orphan an skb on tx
Next: [PATCH 06/10] perf/trace/scripting: workqueue-stats script cleanup