Skip to contentSkip to conversation

imx serial driver: NULL pointer dereference in serial_imx_probe/remove

PATCH New Bas Vermeulen 2 participants 2 messages Feb 11, 2010 Arm i.MX and Layerscape

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 imx serial driver: NULL pointer dereference in serial_imx_probe/remove

Check for NULL pointer before dereferencing, as it is possible and legal to pass in NULL for the platform data for a serial port.

drivers/serial/imx.c +0 -0
index 60d665a..d00fcf8 100644
@@ -1279,7 +1279,7 @@ static int serial_imx_probe(struct platform_device 

*pdev)

          sport->use_irda = 1;

#endif

- if (pdata->init) {

+    if (pdata && pdata->init) {
          ret = pdata->init(pdev);
          if (ret)
              goto clkput;

@@ -1292,7 +1292,7 @@ static int serial_imx_probe(struct platform_device *pdev)

      return 0;
  deinit:
-    if (pdata->exit)
+    if (pdata && pdata->exit)
          pdata->exit(pdev);
  clkput:
      clk_put(sport->clk);

@@ -1321,7 +1321,7 @@ static int serial_imx_remove(struct platform_device *pdev)

      clk_disable(sport->clk);

- if (pdata->exit)
+ if (pdata && pdata->exit)

          pdata->exit(pdev);

      iounmap(sport->port.membase);

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: drivers-imx-serial-null-dereference.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100211/5064c9a5/attachment.el>

#1 lore raw

PATCH 1/1 imx serial driver: NULL pointer dereference in serial_imx_probe/remove

Hi Bas,

Quoted 2 lines · Bas Vermeulen

Check for NULL pointer before dereferencing, as it is possible and legal to pass in NULL for the platform data for a serial port.

Third time's the charm :-). This patch is already queued for .34 in Greg's tty quilt tree.

http://lists.infradead.org/pipermail/linux-arm-kernel/2010-January/007909.html
http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-06-tty/serial-imx-fix-null-dereference-oops-when-pdata-null.patch
http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=commitdiff;h=ed8101ca0251cc0d05bedf577109bfb05b66f5dc

baruch

Quoted 36 lines
drivers/serial/imx.c +1 -1
index 60d665a..d00fcf8 100644
@@ -1279,7 +1279,7 @@ static int serial_imx_probe(struct
 platform_device *pdev)
         sport->use_irda = 1;
 #endif
 
-    if (pdata->init) {
+    if (pdata && pdata->init) {
         ret = pdata->init(pdev);
         if (ret)
             goto clkput;
drivers/serial/imx.c +1 -1
@@ -1292,7 +1292,7 @@ static int serial_imx_probe(struct
 platform_device *pdev)
 
     return 0;
 deinit:
-    if (pdata->exit)
+    if (pdata && pdata->exit)
         pdata->exit(pdev);
 clkput:
     clk_put(sport->clk);
drivers/serial/imx.c +1 -1
@@ -1321,7 +1321,7 @@ static int serial_imx_remove(struct
 platform_device *pdev)
 
     clk_disable(sport->clk);
 
-    if (pdata->exit)
+    if (pdata && pdata->exit)
         pdata->exit(pdev);
 
     iounmap(sport->port.membase);
Signature · 3 lines
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -