summaryrefslogtreecommitdiffstats
path: root/drivers/ps3
diff options
context:
space:
mode:
authorColin King <colin.king@canonical.com>2015-09-14 19:35:04 +0000
committerMichael Ellerman <mpe@ellerman.id.au>2015-09-29 23:00:58 +1000
commit6a6120bc5ec9e54d3cc06e739c270b55b081abe5 (patch)
tree920798384dd3dad9f03bd9094595784b1dd1b907 /drivers/ps3
parent12a509336701132f521c8fc22a5910478ca98cb3 (diff)
downloadlinux-stable-6a6120bc5ec9e54d3cc06e739c270b55b081abe5.tar.gz
linux-stable-6a6120bc5ec9e54d3cc06e739c270b55b081abe5.tar.bz2
linux-stable-6a6120bc5ec9e54d3cc06e739c270b55b081abe5.zip
drivers/ps3: Fix ps3-vuart null dereference
On the unlikely event that drv is null, the current code will perform a null pointer dereference with it when printing a dev_dbg message. Instead, the BUG_ON check on drv should be performed before we emit the dev_dbg message. Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Geoff Levand <geoff@infradead.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'drivers/ps3')
-rw-r--r--drivers/ps3/ps3-vuart.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ps3/ps3-vuart.c b/drivers/ps3/ps3-vuart.c
index d6db822bef84..632701a1d993 100644
--- a/drivers/ps3/ps3-vuart.c
+++ b/drivers/ps3/ps3-vuart.c
@@ -1000,12 +1000,11 @@ static int ps3_vuart_probe(struct ps3_system_bus_device *dev)
dev_dbg(&dev->core, "%s:%d\n", __func__, __LINE__);
drv = ps3_system_bus_dev_to_vuart_drv(dev);
+ BUG_ON(!drv);
dev_dbg(&dev->core, "%s:%d: (%s)\n", __func__, __LINE__,
drv->core.core.name);
- BUG_ON(!drv);
-
if (dev->port_number >= PORT_COUNT) {
BUG();
return -EINVAL;