From: Chris Wright <chrisw@osdl.org>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: akpm@osdl.org, "Theodore Ts'o" <tytso@mit.edu>,
Zwane Mwaikambo <zwane@arm.linux.org.uk>,
Justin Forbes <jmforbes@linuxtx.org>,
Randy Dunlap <rdunlap@xenotime.net>,
torvalds@osdl.org, Chuck Wolber <chuckw@quantumlinux.com>,
alan@lxorguk.ukuu.org.uk,
Mitch Williams <mitch.a.williams@intel.com>,
jgarzik@pobox.com
Subject: [04/07] e1000: fix spinlock bug
Date: Mon, 27 Jun 2005 15:59:31 -0700 [thread overview]
Message-ID: <20050627225931.GM9046@shell0.pdx.osdl.net> (raw)
In-Reply-To: <20050627224651.GI9046@shell0.pdx.osdl.net>
-stable review patch. If anyone has any objections, please let us know.
------------------
This patch fixes an obvious and nasty bug where we could exit the transmit
routine while holding tx_lock.
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Signed-off-by: Chris Wright <chrisw@osdl.org>
---
diff -urpN -X dontdiff linux-2.6.12-clean/drivers/net/e1000/e1000_main.c linux-2.6.12/drivers/net/e1000/e1000_main.c
--- linux-2.6.12-clean/drivers/net/e1000/e1000_main.c 2005-06-17 12:48:29.000000000 -0700
+++ linux-2.6.12/drivers/net/e1000/e1000_main.c 2005-06-21 10:42:29.000000000 -0700
@@ -2307,6 +2307,7 @@ e1000_xmit_frame(struct sk_buff *skb, st
tso = e1000_tso(adapter, skb);
if (tso < 0) {
dev_kfree_skb_any(skb);
+ spin_unlock_irqrestore(&adapter->tx_lock, flags);
return NETDEV_TX_OK;
}
next prev parent reply other threads:[~2005-06-27 23:10 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-27 22:46 [00/07] -stable review Chris Wright
2005-06-27 22:50 ` [01/07] Fix typo in drivers/pci/pci-driver.c Chris Wright
2005-06-27 22:53 ` [02/07] [SCSI] qla2xxx: Pull-down scsi-host-addition to follow board initialization Chris Wright
2005-06-28 21:51 ` Jean Delvare
2005-06-28 22:20 ` Andrew Morton
2005-06-28 22:30 ` Chris Wright
2005-06-28 23:09 ` Andrew Morton
2005-06-28 23:16 ` Chris Wright
2005-06-28 22:32 ` [stable] " Greg KH
2005-06-29 8:08 ` Jean Delvare
2005-06-29 16:36 ` James Bottomley
2005-07-01 11:32 ` Jean Delvare
2005-06-27 22:55 ` [03/07] fix remap_pte_range BUG Chris Wright
2005-06-27 22:59 ` Chris Wright [this message]
2005-06-27 23:01 ` [05/07] Add "memory" clobbers to the x86 inline asm of strncmp and friends Chris Wright
2005-06-28 21:57 ` Jean Delvare
2005-06-27 23:03 ` [06/07] ACPI: Make sure we call acpi_register_gsi() even for default PCI interrupt assignment Chris Wright
2005-06-27 23:05 ` [07/07] [NETLINK]: Fix two socket hashing bugs Chris Wright
2005-06-28 12:10 ` [00/07] -stable review Jim MacBaine
2005-06-28 14:47 ` [stable] " Chris Wright
2005-06-28 17:18 ` Jim MacBaine
2005-06-28 17:20 ` Chris Wright
2005-06-28 20:45 ` David S. Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050627225931.GM9046@shell0.pdx.osdl.net \
--to=chrisw@osdl.org \
--cc=akpm@osdl.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=chuckw@quantumlinux.com \
--cc=jgarzik@pobox.com \
--cc=jmforbes@linuxtx.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mitch.a.williams@intel.com \
--cc=rdunlap@xenotime.net \
--cc=stable@kernel.org \
--cc=torvalds@osdl.org \
--cc=tytso@mit.edu \
--cc=zwane@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®