* Ingo Molnar <mingo@elte.hu> wrote:the patch below works the crash around. It does not seem to be a 'tx ring head bits the tail' scenario: get_tx: 55, put_tx: 57 get_tx: 80, put_tx: 86 get_tx: 88, put_tx: 97 get_tx: 97, put_tx: 109 get_tx: 97, put_tx: 109 get_tx: 111, put_tx: 117 get_tx: 117, put_tx: 125 get_tx: 127, put_tx: 137 get_tx: 137, put_tx: 147 get_tx: 147, put_tx: 149 Ingo ------------> From: Ingo Molnar <mingo@elte.hu> Subject: [patch] forcedeth: work around NULL skb dereference crash work around a NULL skb dereference crash that occurs during high load. Signed-off-by: Ingo Molnar <mingo@elte.hu> --- drivers/net/forcedeth.c | 10 ++++++++++ 1 file changed, 10 insertions(+) Index: linux/drivers/net/forcedeth.c =================================================================== --- linux.orig/drivers/net/forcedeth.c +++ linux/drivers/net/forcedeth.c @@ -1902,6 +1902,11 @@ static void nv_tx_done(struct net_device np->stats.tx_carrier_errors++; np->stats.tx_errors++; } else { + if (!np->get_tx_ctx->skb) { + printk("get_tx: %ld, put_tx: %ld\n", np->get_tx_ctx - np->first_tx_ctx, np->put_tx_ctx - np->first_tx_ctx); + WARN_ON(1); + break; + } np->stats.tx_packets++; np->stats.tx_bytes += np->get_tx_ctx->skb->len; } @@ -1917,6 +1922,11 @@ static void nv_tx_done(struct net_device np->stats.tx_carrier_errors++; np->stats.tx_errors++; } else { + if (!np->get_tx_ctx->skb) { + printk("get_tx: %ld, put_tx: %ld\n", np->get_tx_ctx - np->first_tx_ctx, np->put_tx_ctx - np->first_tx_ctx); + WARN_ON(1); + break; + } np->stats.tx_packets++; np->stats.tx_bytes += np->get_tx_ctx->skb->len; } -
| Jesse Barnes | Re: [stable] [BUG][PATCH] cpqphp: fix kernel NULL pointer dereference |
| Greg KH | [003/136] p54usb: add Zcomax XG-705A usbid |
| Magnus Damm | [PATCH 03/07] ARM: Use shared GIC entry macros on Realview |
| Oliver Neukum | Re: [Bug #13682] The webcam stopped working when upgrading from 2.6.29 to 2.6.30 |
| Martin Schwidefsky | Re: [PATCH] optimized ktime_get[_ts] for GENERIC_TIME=y |
git: | |
| Junio C Hamano | Re: Some advanced index playing |
| Jeff King | Re: confusion over the new branch and merge config |
| Robin Rosenberg | Re: cvs2svn conversion directly to git ready for experimentation |
| Linus Torvalds | git binary size... |
| Ævar Arnfjörð Bjarmason | Re: Challenge with Git-Bash |
