From: Roel Kluin <roel.kluin@gmail.com>
To: netdev@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>,
"David S. Miller" <davem@davemloft.net>,
n0-1@freewrt.org, florian@openwrt.org
Subject: [PATCH] korina: Read buffer overflow
Date: Fri, 07 Aug 2009 17:33:31 +0200 [thread overview]
Message-ID: <4A7C494B.2060204@gmail.com> (raw)
If the loop breaks with an i of 0, then we read lp->rd_ring[-1].
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
Should we clean up like this? please review
diff --git a/drivers/net/korina.c b/drivers/net/korina.c
index b4cf602..b965b2b 100644
--- a/drivers/net/korina.c
+++ b/drivers/net/korina.c
@@ -754,7 +754,7 @@ static void korina_alloc_ring(struct net_device *dev)
{
struct korina_private *lp = netdev_priv(dev);
struct sk_buff *skb;
- int i;
+ int i, j;
/* Initialize the transmit descriptors */
for (i = 0; i < KORINA_NUM_TDS; i++) {
@@ -771,7 +771,7 @@ static void korina_alloc_ring(struct net_device *dev)
for (i = 0; i < KORINA_NUM_RDS; i++) {
skb = dev_alloc_skb(KORINA_RBSIZE + 2);
if (!skb)
- break;
+ goto err_free;
skb_reserve(skb, 2);
lp->rx_skb[i] = skb;
lp->rd_ring[i].control = DMA_DESC_IOD |
@@ -790,6 +790,12 @@ static void korina_alloc_ring(struct net_device *dev)
lp->rx_chain_head = 0;
lp->rx_chain_tail = 0;
lp->rx_chain_status = desc_empty;
+err_free:
+ for (j = 0; j < i; j++) {
+ lp->rd_ring[j].control = 0;
+ dev_kfree_skb_any(lp->rx_skb[j]);
+ lp->rx_skb[j] = NULL;
+ }
}
static void korina_free_ring(struct net_device *dev)
next reply other threads:[~2009-08-07 15:29 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-07 15:33 Roel Kluin [this message]
2009-08-08 0:48 ` [PATCH] korina: Read buffer overflow Phil Sutter
2009-08-08 13:14 ` roel kluin
2009-08-08 16:45 ` Phil Sutter
2009-08-09 0:06 ` Phil Sutter
2009-08-12 22:15 ` Phil Sutter
2009-08-12 22:22 ` [PATCH 1/2] korina: fix printk formatting, add final info line Phil Sutter
2009-08-12 22:52 ` [PATCH 2/2] korina: add error-handling to korina_alloc_ring Phil Sutter
2009-08-13 23:27 ` David Miller
2009-08-13 23:27 ` [PATCH 1/2] korina: fix printk formatting, add final info line David Miller
[not found] ` <1249776388-4626-1-git-send-email-n0-1@freewrt.org>
2009-08-09 0:06 ` [PATCH 1/3] " Phil Sutter
[not found] ` <1249776388-4626-2-git-send-email-n0-1@freewrt.org>
2009-08-09 0:06 ` [PATCH 2/3] korina: add error-handling to korina_alloc_ring Phil Sutter
[not found] ` <1249776388-4626-3-git-send-email-n0-1@freewrt.org>
2009-08-09 0:06 ` [PATCH 3/3] korina: convert to net_device_ops Phil Sutter
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=4A7C494B.2060204@gmail.com \
--to=roel.kluin@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=florian@openwrt.org \
--cc=n0-1@freewrt.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.