From: Amit Kumar Salecha <amit.salecha@qlogic.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, ameen.rahman@qlogic.com
Subject: [PATCH NEXT 6/8] qlcnic: fix rcv buffer leak
Date: Thu, 22 Apr 2010 05:51:40 -0700 [thread overview]
Message-ID: <1271940702-17064-7-git-send-email-amit.salecha@qlogic.com> (raw)
In-Reply-To: <1271940702-17064-1-git-send-email-amit.salecha@qlogic.com>
Rcv producer value should be read in spin-lock.
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
---
drivers/net/qlcnic/qlcnic_init.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/net/qlcnic/qlcnic_init.c b/drivers/net/qlcnic/qlcnic_init.c
index 9ef9f58..1b621ca 100644
--- a/drivers/net/qlcnic/qlcnic_init.c
+++ b/drivers/net/qlcnic/qlcnic_init.c
@@ -1554,9 +1554,10 @@ qlcnic_post_rx_buffers(struct qlcnic_adapter *adapter, u32 ringid,
int producer, count = 0;
struct list_head *head;
+ spin_lock(&rds_ring->lock);
+
producer = rds_ring->producer;
- spin_lock(&rds_ring->lock);
head = &rds_ring->free_list;
while (!list_empty(head)) {
@@ -1578,13 +1579,13 @@ qlcnic_post_rx_buffers(struct qlcnic_adapter *adapter, u32 ringid,
producer = get_next_index(producer, rds_ring->num_desc);
}
- spin_unlock(&rds_ring->lock);
if (count) {
rds_ring->producer = producer;
writel((producer-1) & (rds_ring->num_desc-1),
rds_ring->crb_rcv_producer);
}
+ spin_unlock(&rds_ring->lock);
}
static void
@@ -1596,10 +1597,11 @@ qlcnic_post_rx_buffers_nodb(struct qlcnic_adapter *adapter,
int producer, count = 0;
struct list_head *head;
- producer = rds_ring->producer;
if (!spin_trylock(&rds_ring->lock))
return;
+ producer = rds_ring->producer;
+
head = &rds_ring->free_list;
while (!list_empty(head)) {
--
1.6.0.2
next prev parent reply other threads:[~2010-04-22 12:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-22 12:51 [PATCH NEXT 0/8]qlcnic: inter driver coexistence fixes Amit Kumar Salecha
2010-04-22 12:51 ` [PATCH NEXT 1/8] qlcnic: additional driver statistics Amit Kumar Salecha
2010-04-22 12:51 ` [PATCH NEXT 2/8] qlcnic: fix defines as per IDC document Amit Kumar Salecha
2010-04-22 12:51 ` [PATCH NEXT 3/8] qlcnic: fix fw initialization responsibility Amit Kumar Salecha
2010-04-22 12:51 ` [PATCH NEXT 4/8] qlcnic: define macro for driver state Amit Kumar Salecha
2010-04-22 12:51 ` [PATCH NEXT 5/8] qlcnic: fix pci semaphore checks Amit Kumar Salecha
2010-04-22 12:51 ` Amit Kumar Salecha [this message]
2010-04-22 12:51 ` [PATCH NEXT 7/8] qlcnic: protect resource access Amit Kumar Salecha
2010-04-22 12:51 ` [PATCH NEXT 8/8] qlcnic: update version 5.0.2 Amit Kumar Salecha
2010-04-23 3:54 ` [PATCH NEXT 0/8]qlcnic: inter driver coexistence fixes David 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=1271940702-17064-7-git-send-email-amit.salecha@qlogic.com \
--to=amit.salecha@qlogic.com \
--cc=ameen.rahman@qlogic.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).