hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tahvo-usb: Fix NULL ptr deref in OTR irq handler 

SVN-Revision: 25913
owl
Michael Büsch 2011-03-06 22:58:49 +00:00
parent 7b64200684
commit 218ce7a205
1 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
target/linux/omap24xx/patches-2.6.38/590-cbus-tahvo-usb-fixes.patch
View File

@ -1,15 +1,51 @@
Index: linux-2.6.38-rc7/drivers/cbus/tahvo-usb.c Index: linux-2.6.38-rc7/drivers/cbus/tahvo-usb.c
=================================================================== ===================================================================
--- linux-2.6.38-rc7.orig/drivers/cbus/tahvo-usb.c 2011-03-06 23:00:14.411191087 +0100 --- linux-2.6.38-rc7.orig/drivers/cbus/tahvo-usb.c 2011-03-06 23:00:14.411191087 +0100
+++ linux-2.6.38-rc7/drivers/cbus/tahvo-usb.c 2011-03-06 23:00:16.571473834 +0100 +++ linux-2.6.38-rc7/drivers/cbus/tahvo-usb.c 2011-03-06 23:43:26.524751556 +0100
@@ -98,6 +98,7 @@ struct tahvo_usb { @@ -98,8 +98,9 @@ struct tahvo_usb {
#ifdef CONFIG_USB_OTG #ifdef CONFIG_USB_OTG
int tahvo_mode; int tahvo_mode;
#endif #endif
+ struct clk *ick; + struct clk *ick;
}; };
static struct platform_device tahvo_usb_device; -static struct platform_device tahvo_usb_device;
+static struct tahvo_usb *tahvo_usb_device;
/*
* ---------------------------------------------------------------------------
@@ -114,8 +115,7 @@ static struct platform_device *tahvo_otg
static irqreturn_t omap_otg_irq(int irq, void *arg)
{
- struct platform_device *otg_dev = arg;
- struct tahvo_usb *tu = platform_get_drvdata(otg_dev);
+ struct tahvo_usb *tu = arg;
u16 otg_irq;
otg_irq = omap_readw(OTG_IRQ_SRC);
@@ -201,12 +201,12 @@ static int __init omap_otg_probe(struct
return request_irq(tahvo_otg_dev->resource[1].start,
omap_otg_irq, IRQF_DISABLED, DRIVER_NAME,
- &tahvo_usb_device);
+ tahvo_usb_device);
}
static int __exit omap_otg_remove(struct platform_device *pdev)
{
- free_irq(tahvo_otg_dev->resource[1].start, &tahvo_usb_device);
+ free_irq(tahvo_otg_dev->resource[1].start, tahvo_usb_device);
tahvo_otg_dev = NULL;
return 0;
@@ -659,6 +659,7 @@ static int __init tahvo_usb_probe(struct
tu = kzalloc(sizeof(*tu), GFP_KERNEL);
if (!tu)
return -ENOMEM;
+ tahvo_usb_device = tu;
tu->pt_dev = container_of(dev, struct platform_device, dev);
#ifdef CONFIG_USB_OTG
@@ -673,6 +674,14 @@ static int __init tahvo_usb_probe(struct @@ -673,6 +674,14 @@ static int __init tahvo_usb_probe(struct
INIT_WORK(&tu->irq_work, tahvo_usb_irq_work); INIT_WORK(&tu->irq_work, tahvo_usb_irq_work);
mutex_init(&tu->serialize); mutex_init(&tu->serialize);
@ -49,7 +85,7 @@ Index: linux-2.6.38-rc7/drivers/cbus/tahvo-usb.c
} }
dev_set_drvdata(dev, tu); dev_set_drvdata(dev, tu);
@@ -719,10 +725,22 @@ static int __init tahvo_usb_probe(struct @@ -719,10 +725,23 @@ static int __init tahvo_usb_probe(struct
* may not be generated in addition to this. */ * may not be generated in addition to this. */
schedule_work(&tu->irq_work); schedule_work(&tu->irq_work);
return 0; return 0;
@ -61,6 +97,7 @@ Index: linux-2.6.38-rc7/drivers/cbus/tahvo-usb.c
+ clk_put(tu->ick); + clk_put(tu->ick);
+err_free_tu: +err_free_tu:
+ kfree(tu); + kfree(tu);
+ tahvo_usb_device = NULL;
+ +
+ return ret; + return ret;
} }
@ -72,7 +109,7 @@ Index: linux-2.6.38-rc7/drivers/cbus/tahvo-usb.c
dev_dbg(&pdev->dev, "remove\n"); dev_dbg(&pdev->dev, "remove\n");
tahvo_free_irq(TAHVO_INT_VBUSON); tahvo_free_irq(TAHVO_INT_VBUSON);
@@ -732,6 +750,11 @@ static int __exit tahvo_usb_remove(struc @@ -732,6 +751,12 @@ static int __exit tahvo_usb_remove(struc
#ifdef CONFIG_USB_OTG #ifdef CONFIG_USB_OTG
device_remove_file(&pdev->dev, &dev_attr_otg_mode); device_remove_file(&pdev->dev, &dev_attr_otg_mode);
#endif #endif
@ -80,6 +117,7 @@ Index: linux-2.6.38-rc7/drivers/cbus/tahvo-usb.c
+ clk_put(tu->ick); + clk_put(tu->ick);
+ +
+ kfree(tu); + kfree(tu);
+ tahvo_usb_device = NULL;
+ +
return 0; return 0;
} }