Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   Ubuntu Kernel Team (http://www.linux-archive.org/ubuntu-kernel-team/)
-   -   UBUNTU: SAUCE: (drop after 2.6.39) staging: rts_pstor: potential NULL dereference (http://www.linux-archive.org/ubuntu-kernel-team/507845-ubuntu-sauce-drop-after-2-6-39-staging-rts_pstor-potential-null-dereference.html)

Keng-Yu Lin 03-31-2011 03:51 AM

UBUNTU: SAUCE: (drop after 2.6.39) staging: rts_pstor: potential NULL dereference
 
From: Vasiliy Kulikov <segoon@openwall.com>

pci_get_bus_and_slot() may return NULL, but the caller checks
wrong variable.

Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

BugLink: http://bugs.launchpad.net/bugs/698006
(cherry picked from commit 37af07d19a53924a70ae42faebf968c04a631c8c)

Signed-off-by: Keng-Yu Lin <keng-yu.lin@canonical.com>
---
drivers/staging/rts_pstor/rtsx.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/rts_pstor/rtsx.c b/drivers/staging/rts_pstor/rtsx.c
index 9864b1a..2b18379 100644
--- a/drivers/staging/rts_pstor/rtsx.c
+++ b/drivers/staging/rts_pstor/rtsx.c
@@ -334,7 +334,7 @@ int rtsx_read_pci_cfg_byte(u8 bus, u8 dev, u8 func, u8 offset, u8 *val)
u8 devfn = (dev << 3) | func;

pdev = pci_get_bus_and_slot(bus, devfn);
- if (!dev)
+ if (!pdev)
return -1;

pci_read_config_byte(pdev, offset, &data);
--
1.7.1


--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team


All times are GMT. The time now is 12:39 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.