From: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
To: Russell Nelson <nelson@crynwr.com>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] 2.2 - cs89x0 - unchecked kmalloc
Date: Tue, 19 Dec 2000 20:39:26 -0200 [thread overview]
Message-ID: <20001219203926.M764@conectiva.com.br> (raw)
Please consider applying
- Arnaldo
--- linux-2.2.19-2/drivers/net/cs89x0.c Mon Aug 9 16:05:05 1999
+++ linux-2.2.19-2.acme/drivers/net/cs89x0.c Tue Dec 19 20:25:12 2000
@@ -27,6 +27,8 @@
: is running from all accounts.
Alan Cox : Removed 1.2 support, added 2.1 extra counters.
+
+ Arnaldo Melo : release resources on failure in cs89x0_probe1
*/
static char *version =
@@ -249,13 +251,17 @@
struct net_local *lp;
static unsigned version_printed = 0;
int i;
+ char priv_alloced_here = 0;
unsigned rev_type = 0;
int eeprom_buff[CHKSUM_LEN];
/* Initialize the device structure. */
if (dev->priv == NULL) {
dev->priv = kmalloc(sizeof(struct net_local), GFP_KERNEL);
+ if (!dev->priv)
+ return -ENOMEM;
memset(dev->priv, 0, sizeof(struct net_local));
+ priv_alloced_here = 1;
}
lp = (struct net_local *)dev->priv;
@@ -265,12 +271,12 @@
if (ioaddr & 1) {
ioaddr &= ~1;
if ((inw(ioaddr + ADD_PORT) & ADD_MASK) != ADD_SIG)
- return ENODEV;
+ goto err;
outw(PP_ChipID, ioaddr + ADD_PORT);
}
if (inw(ioaddr + DATA_PORT) != CHIP_EISA_ID_SIG)
- return ENODEV;
+ goto err;
/* Fill in the 'dev' fields. */
dev->base_addr = ioaddr;
@@ -388,6 +394,11 @@
printk("\n");
return 0;
+err: if (priv_alloced_here) {
+ kfree(dev->priv);
+ dev->priv = NULL;
+ }
+ return -ENODEV;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/
reply other threads:[~2000-12-20 1:01 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20001219203926.M764@conectiva.com.br \
--to=acme@conectiva.com.br \
--cc=linux-kernel@vger.kernel.org \
--cc=nelson@crynwr.com \
/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).