From: Dan Carpenter <error27@gmail.com>
To: Matt Porter <mporter@kernel.crashing.org>
Cc: Alexandre Bounine <alexandre.bounine@idt.com>,
open list <linux-kernel@vger.kernel.org>,
kernel-janitors@vger.kernel.org
Subject: [patch] rapidio: potential null deref in rio_setup_device()
Date: Sat, 27 Aug 2011 10:00:45 +0000 [thread overview]
Message-ID: <20110827100045.GL3775@shale.localdomain> (raw)
The "goto cleanup" path can dereference "rswitch" which is NULL here.
Signed-off-by: Dan Carpenter <error27@gmail.com>
---
This is sort of embarrassing, I've patched this function before but
missed this. Hopefully it's right now.
diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c
index 0914f49..882cef9 100644
--- a/drivers/rapidio/rio-scan.c
+++ b/drivers/rapidio/rio-scan.c
@@ -432,7 +432,7 @@ static struct rio_dev __devinit *rio_setup_device(struct rio_net *net,
/* Assign component tag to device */
if (next_comptag >= 0x10000) {
pr_err("RIO: Component Tag Counter Overflow\n");
- goto cleanup;
+ goto out_rdev;
}
rio_mport_write_config_32(port, destid, hopcount,
RIO_COMPONENT_TAG_CSR, next_comptag);
@@ -518,7 +518,7 @@ static struct rio_dev __devinit *rio_setup_device(struct rio_net *net,
cleanup:
if (rio_is_switch(rdev))
kfree(rswitch->route_table);
-
+out_rdev:
kfree(rdev);
return NULL;
}
next reply other threads:[~2011-08-27 10:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-27 10:00 Dan Carpenter [this message]
2011-08-29 13:51 ` [patch] rapidio: potential null deref in rio_setup_device() Bounine, Alexandre
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=20110827100045.GL3775@shale.localdomain \
--to=error27@gmail.com \
--cc=alexandre.bounine@idt.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mporter@kernel.crashing.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