[PATCH 1/3] [POWERPC] of_serial: Fix possible null dereference.

Josh Boyer jwboyer at linux.vnet.ibm.com
Fri Mar 21 12:41:03 EST 2008


On Thu, 20 Mar 2008 17:58:07 -0600
"Grant Likely" <grant.likely at secretlab.ca> wrote:

> On Thu, Mar 20, 2008 at 8:43 AM, John Linn <john.linn at xilinx.com> wrote:
> > From: Stephen Neuendorffer <stephen.neuendorffer at xilinx.com>
> >
> >  The of_serial driver queries the current-speed property and attempts
> >  to use it to register the custom_divisor property of the uart_port.
> >  However, if current-speed is not set, then this code will dereference
> >  a bad pointer.  The fix is to only set custom_divisor when a
> >  current-speed property appears in the device tree.
> >
> >  Signed-off-by: Stephen Neuendorffer <stephen.neuendorffer at xilinx.com>
> >  Signed-off-by: John Linn <john.linn at xilinx.com>
> 
> This looks correct and appropriate to me.
> 
> Acked-by: Grant Likely <grant.likely at secretlab.ca>

Agreed.

Acked-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>

> Josh/Arnd, could either of you pick this up?

Arnd, can you send this on to Andrew?  Or if you are busy I can.

josh

> >  ---
> >   drivers/serial/of_serial.c |    4 +++-
> >   1 files changed, 3 insertions(+), 1 deletions(-)
> >
> >  diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c
> >  index a64d858..2efb892 100644
> >  --- a/drivers/serial/of_serial.c
> >  +++ b/drivers/serial/of_serial.c
> >  @@ -56,7 +56,9 @@ static int __devinit of_platform_serial_setup(struct of_device *ofdev,
> >         port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP
> >                 | UPF_FIXED_PORT;
> >         port->dev = &ofdev->dev;
> >  -       port->custom_divisor = *clk / (16 * (*spd));
> >  +       /* If current-speed was set, then try not to change it. */
> >  +       if (spd)
> >  +               port->custom_divisor = *clk / (16 * (*spd));
> >
> >         return 0;
> >   }
> >  --
> >  1.5.2.1
> >
> >
> >
> >  _______________________________________________
> >  Linuxppc-dev mailing list
> >  Linuxppc-dev at ozlabs.org
> >  https://ozlabs.org/mailman/listinfo/linuxppc-dev
> >
> 
> 
> 



More information about the Linuxppc-dev mailing list