| Message ID | 1400586228-23880-1-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, May 20, 2014 at 01:43:48PM +0200, Geert Uytterhoeven wrote: > If of_property_read_string() fails, comp_str will be uninitialized, > causing crashes: > > Unable to handle kernel NULL pointer dereference at virtual address 0000009f > ... > PC is at strcmp+0xc/0x40 > LR is at m25p_probe+0x410/0xa04 > > and > > Unable to handle kernel NULL pointer dereference at virtual address 00000000 > ... > PC is at strcmp+0xc/0x40 > LR is at m25p_probe+0x6f4/0xa0c > > Introduced by "mtd: xilinx: merge nand flash support from xilinx > repository" ([ltsi-kernel.git] / patches.zynq / > 0007-mtd-xilinx-merge-nand-flash-support-from-xilinx-repo.patch) > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > drivers/mtd/devices/m25p80.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) Thanks, I'll queue this up when I update the ltsi kernel tree next week. greg k-h
Hi Greg, On Thu, May 22, 2014 at 12:07 AM, Greg KH <gregkh@linuxfoundation.org> wrote: > On Tue, May 20, 2014 at 01:43:48PM +0200, Geert Uytterhoeven wrote: >> If of_property_read_string() fails, comp_str will be uninitialized, >> causing crashes: >> >> Unable to handle kernel NULL pointer dereference at virtual address 0000009f >> ... >> PC is at strcmp+0xc/0x40 >> LR is at m25p_probe+0x410/0xa04 >> >> and >> >> Unable to handle kernel NULL pointer dereference at virtual address 00000000 >> ... >> PC is at strcmp+0xc/0x40 >> LR is at m25p_probe+0x6f4/0xa0c >> >> Introduced by "mtd: xilinx: merge nand flash support from xilinx >> repository" ([ltsi-kernel.git] / patches.zynq / >> 0007-mtd-xilinx-merge-nand-flash-support-from-xilinx-repo.patch) >> >> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> >> --- >> drivers/mtd/devices/m25p80.c | 9 +++++---- >> 1 file changed, 5 insertions(+), 4 deletions(-) > > Thanks, I'll queue this up when I update the ltsi kernel tree next week. BTW, are you aware 0007-mtd-xilinx-merge-nand-flash-support-from-xilinx-repo.patch is not in mainline? Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Thu, May 22, 2014 at 08:46:53AM +0200, Geert Uytterhoeven wrote: > Hi Greg, > > On Thu, May 22, 2014 at 12:07 AM, Greg KH <gregkh@linuxfoundation.org> wrote: > > On Tue, May 20, 2014 at 01:43:48PM +0200, Geert Uytterhoeven wrote: > >> If of_property_read_string() fails, comp_str will be uninitialized, > >> causing crashes: > >> > >> Unable to handle kernel NULL pointer dereference at virtual address 0000009f > >> ... > >> PC is at strcmp+0xc/0x40 > >> LR is at m25p_probe+0x410/0xa04 > >> > >> and > >> > >> Unable to handle kernel NULL pointer dereference at virtual address 00000000 > >> ... > >> PC is at strcmp+0xc/0x40 > >> LR is at m25p_probe+0x6f4/0xa0c > >> > >> Introduced by "mtd: xilinx: merge nand flash support from xilinx > >> repository" ([ltsi-kernel.git] / patches.zynq / > >> 0007-mtd-xilinx-merge-nand-flash-support-from-xilinx-repo.patch) > >> > >> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > >> --- > >> drivers/mtd/devices/m25p80.c | 9 +++++---- > >> 1 file changed, 5 insertions(+), 4 deletions(-) > > > > Thanks, I'll queue this up when I update the ltsi kernel tree next week. > > BTW, are you aware > 0007-mtd-xilinx-merge-nand-flash-support-from-xilinx-repo.patch > is not in mainline? Lots of patches in the LTSI tree are not in mainline :(
On Thu, 2014-05-22 at 04:06PM +0900, Greg KH wrote: > On Thu, May 22, 2014 at 08:46:53AM +0200, Geert Uytterhoeven wrote: > > Hi Greg, > > > > On Thu, May 22, 2014 at 12:07 AM, Greg KH <gregkh@linuxfoundation.org> wrote: > > > On Tue, May 20, 2014 at 01:43:48PM +0200, Geert Uytterhoeven wrote: > > >> If of_property_read_string() fails, comp_str will be uninitialized, > > >> causing crashes: > > >> > > >> Unable to handle kernel NULL pointer dereference at virtual address 0000009f > > >> ... > > >> PC is at strcmp+0xc/0x40 > > >> LR is at m25p_probe+0x410/0xa04 > > >> > > >> and > > >> > > >> Unable to handle kernel NULL pointer dereference at virtual address 00000000 > > >> ... > > >> PC is at strcmp+0xc/0x40 > > >> LR is at m25p_probe+0x6f4/0xa0c > > >> > > >> Introduced by "mtd: xilinx: merge nand flash support from xilinx > > >> repository" ([ltsi-kernel.git] / patches.zynq / > > >> 0007-mtd-xilinx-merge-nand-flash-support-from-xilinx-repo.patch) > > >> > > >> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > > >> --- > > >> drivers/mtd/devices/m25p80.c | 9 +++++---- > > >> 1 file changed, 5 insertions(+), 4 deletions(-) > > > > > > Thanks, I'll queue this up when I update the ltsi kernel tree next week. > > > > BTW, are you aware > > 0007-mtd-xilinx-merge-nand-flash-support-from-xilinx-repo.patch > > is not in mainline? > > Lots of patches in the LTSI tree are not in mainline :( We're working on it. I don't know the exact state, but Zynq mainline support is growing quite a bit. Sören
Hi Geert, Thanks for the patch, and sorry that I introduced a patch with a bug. Regards Daniel On 2014/05/20 20:43, Geert Uytterhoeven wrote: > If of_property_read_string() fails, comp_str will be uninitialized, > causing crashes: > > Unable to handle kernel NULL pointer dereference at virtual address 0000009f > ... > PC is at strcmp+0xc/0x40 > LR is at m25p_probe+0x410/0xa04 > > and > > Unable to handle kernel NULL pointer dereference at virtual address 00000000 > ... > PC is at strcmp+0xc/0x40 > LR is at m25p_probe+0x6f4/0xa0c > > Introduced by "mtd: xilinx: merge nand flash support from xilinx > repository" ([ltsi-kernel.git] / patches.zynq / > 0007-mtd-xilinx-merge-nand-flash-support-from-xilinx-repo.patch) > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > drivers/mtd/devices/m25p80.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c > index 3572513cb0f0..d33317d7842e 100644 > --- a/drivers/mtd/devices/m25p80.c > +++ b/drivers/mtd/devices/m25p80.c > @@ -1243,8 +1243,8 @@ static int m25p_probe(struct spi_device *spi) > const char *comp_str; > u32 is_dual; > np = of_get_next_parent(spi->dev.of_node); > - of_property_read_string(np, "compatible", &comp_str); > - if (!strcmp(comp_str, "xlnx,ps7-qspi-1.00.a")) { > + if (!of_property_read_string(np, "compatible", &comp_str) && > + !strcmp(comp_str, "xlnx,ps7-qspi-1.00.a")) { > if (of_property_read_u32(np, "is-dual", &is_dual) < 0) { > /* Default to single if prop not defined */ > flash->shift = 0; > @@ -1354,8 +1354,9 @@ static int m25p_probe(struct spi_device *spi) > #ifdef CONFIG_OF > const char *comp_str; > np = of_get_next_parent(spi->dev.of_node); > - of_property_read_string(np, "compatible", &comp_str); > - if (!strcmp(comp_str, "xlnx,ps7-qspi-1.00.a")) { > + if (!of_property_read_string(np, "compatible", > + &comp_str) && > + !strcmp(comp_str, "xlnx,ps7-qspi-1.00.a")) { > flash->addr_width = 3; > set_4byte(flash, info->jedec_id, 0); > } else { >
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 3572513cb0f0..d33317d7842e 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -1243,8 +1243,8 @@ static int m25p_probe(struct spi_device *spi) const char *comp_str; u32 is_dual; np = of_get_next_parent(spi->dev.of_node); - of_property_read_string(np, "compatible", &comp_str); - if (!strcmp(comp_str, "xlnx,ps7-qspi-1.00.a")) { + if (!of_property_read_string(np, "compatible", &comp_str) && + !strcmp(comp_str, "xlnx,ps7-qspi-1.00.a")) { if (of_property_read_u32(np, "is-dual", &is_dual) < 0) { /* Default to single if prop not defined */ flash->shift = 0; @@ -1354,8 +1354,9 @@ static int m25p_probe(struct spi_device *spi) #ifdef CONFIG_OF const char *comp_str; np = of_get_next_parent(spi->dev.of_node); - of_property_read_string(np, "compatible", &comp_str); - if (!strcmp(comp_str, "xlnx,ps7-qspi-1.00.a")) { + if (!of_property_read_string(np, "compatible", + &comp_str) && + !strcmp(comp_str, "xlnx,ps7-qspi-1.00.a")) { flash->addr_width = 3; set_4byte(flash, info->jedec_id, 0); } else {
If of_property_read_string() fails, comp_str will be uninitialized, causing crashes: Unable to handle kernel NULL pointer dereference at virtual address 0000009f ... PC is at strcmp+0xc/0x40 LR is at m25p_probe+0x410/0xa04 and Unable to handle kernel NULL pointer dereference at virtual address 00000000 ... PC is at strcmp+0xc/0x40 LR is at m25p_probe+0x6f4/0xa0c Introduced by "mtd: xilinx: merge nand flash support from xilinx repository" ([ltsi-kernel.git] / patches.zynq / 0007-mtd-xilinx-merge-nand-flash-support-from-xilinx-repo.patch) Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- drivers/mtd/devices/m25p80.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)