Re: [PATCH] dma: of-dma: check OF pointer property before dereferencing it
On 04/15/2013 10:39 AM, Paolo Pisati wrote:
> Signed-off-by: Paolo Pisati
That should already be fixed in the DMA tree. See commit 7362f04c28 ("DMA:
OF: Check properties value before running be32_to_cpup() on it").
- Lars
> ---
> drivers/dma/of-dma.c |7 +--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c
> index 69d04d2..9628298 100644
> --- a/drivers/dma/of-dma.c
> +++ b/drivers/dma/of-dma.c
> @@ -91,6 +91,7 @@ int of_dma_controller_register(struct device_node *np,
> (struct of_phandle_args *, struct of_dma *),
> void *data)
> {
> + void*parent;
> struct of_dma *ofdma;
> int nbcells;
>
> @@ -103,8 +104,10 @@ int of_dma_controller_register(struct device_node *np,
> if (!ofdma)
> return -ENOMEM;
>
> - nbcells = be32_to_cpup(of_get_property(np, "#dma-cells", NULL));
> - if (!nbcells) {
> + parent = of_get_property(np, "#dma-cells", NULL);
> + if (parent)
> + nbcells = be32_to_cpup(parent);
> + if (!parent || !nbcells) {
> pr_err("%s: #dma-cells property is missing or invalid\n",
> __func__);
> kfree(ofdma);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH] dma: of-dma: check OF pointer property before dereferencing
Unable to handle kernel NULL pointer dereference at virtual address pgd = c0004000 [] *pgd= Internal error: Oops: 5 [#1] SMP ARM CPU: 0Tainted: GW (3.9.0-rc739rc7fix1-dirty #10) PC is at of_dma_controller_register+0xb8/0x11c LR is at of_find_property+0x44/0x4c pc : []lr : []psr: 6113 sp : ef043e40 ip : fp : c01af774 r10: ef015550 r9 : c01af5c0 r8 : r7 : c01afb40 r6 : ef120400 r5 : c48613dc r4 : ef02e900 r3 : r2 : 0023 r1 : a113 r0 : Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel Control: 10c5387d Table: 404a DAC: 0015 Process swapper/0 (pid: 1, stack limit = 0xef042238) Stack: (0xef043e40 to 0xef044000) 3e40: ef015550 ef01558c ef120400 c01affe4 c01af5c0 ef015584 c01b1170 3e60: ef015550 c033ca54 c48613dc c033ca54 007c 00041308 ef103d80 3e80: a113 ef012440 c03bc7d4 ef120400 c03bc780 c03bc780 3ea0: c038c000 c01ac1f4 c01ac16c ef120400 c03fa67c c03fa684 3ec0: c01d9570 ef120400 c03bc780 ef120434 008b c01d9718 3ee0: c03bc780 c01d968c c01d7ce4 ef0c2558 ef0eefb4 ef02b100 c03bc780 3f00: c03bc64c c01d8450 c033cfa8 c03bc1e0 c03bc780 c0398e48 c03a0784 c03cab40 3f20: 008b c01d9ce8 0006 c0398e48 c03a0784 c03cab40 008b 3f40: c0377878 0006 0006 c03b25a4 0006 0006 c0398e48 3f60: c03a0784 c03cab40 008b c0398e54 c037727c c0377a44 0006 0006 3f80: c037727c c02bb874 3fa0: c02bb87c c000dfd8 3fc0: 3fe0: 0013 [] (of_dma_controller_register+0xb8/0x11c) from [] (pl330_probe+0x740/0xa9c) [] (pl330_probe+0x740/0xa9c) from [] (amba_probe+0x88/0xa0) [] (amba_probe+0x88/0xa0) from [] (driver_probe_device+0xf8/0x214) [] (driver_probe_device+0xf8/0x214) from [] (__driver_attach+0x8c/0x90) [] (__driver_attach+0x8c/0x90) from [] (bus_for_each_dev+0x54/0x88) [] (bus_for_each_dev+0x54/0x88) from [] (bus_add_driver+0xdc/0x230) [] (bus_add_driver+0xdc/0x230) from [] (driver_register+0x78/0x14c) [] (driver_register+0x78/0x14c) from [] (do_one_initcall+0x90/0x160) [] (do_one_initcall+0x90/0x160) from [] (kernel_init_freeable+0xfc/0x1c4) [] (kernel_init_freeable+0xfc/0x1c4) from [] (kernel_init+0x8/0xe4) [] (kernel_init+0x8/0xe4) from [] (ret_from_fork+0x14/0x3c) Code: e1a8 e8bd87f0 e3a04010 eae0 (e5909000) ---[ end trace 1b75b31a2719ed1e ]--- Kernel panic - not syncing: Attempted to kill init! exitcode=0x000b Paolo Pisati (1): dma: of-dma: check OF pointer property before dereferencing it drivers/dma/of-dma.c |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] dma: of-dma: check OF pointer property before dereferencing it
Signed-off-by: Paolo Pisati
---
drivers/dma/of-dma.c |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c
index 69d04d2..9628298 100644
--- a/drivers/dma/of-dma.c
+++ b/drivers/dma/of-dma.c
@@ -91,6 +91,7 @@ int of_dma_controller_register(struct device_node *np,
(struct of_phandle_args *, struct of_dma *),
void *data)
{
+ void*parent;
struct of_dma *ofdma;
int nbcells;
@@ -103,8 +104,10 @@ int of_dma_controller_register(struct device_node *np,
if (!ofdma)
return -ENOMEM;
- nbcells = be32_to_cpup(of_get_property(np, "#dma-cells", NULL));
- if (!nbcells) {
+ parent = of_get_property(np, "#dma-cells", NULL);
+ if (parent)
+ nbcells = be32_to_cpup(parent);
+ if (!parent || !nbcells) {
pr_err("%s: #dma-cells property is missing or invalid\n",
__func__);
kfree(ofdma);
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH] dma: of-dma: check OF pointer property before dereferencing it
Signed-off-by: Paolo Pisati paolo.pis...@canonical.com
---
drivers/dma/of-dma.c |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c
index 69d04d2..9628298 100644
--- a/drivers/dma/of-dma.c
+++ b/drivers/dma/of-dma.c
@@ -91,6 +91,7 @@ int of_dma_controller_register(struct device_node *np,
(struct of_phandle_args *, struct of_dma *),
void *data)
{
+ void*parent;
struct of_dma *ofdma;
int nbcells;
@@ -103,8 +104,10 @@ int of_dma_controller_register(struct device_node *np,
if (!ofdma)
return -ENOMEM;
- nbcells = be32_to_cpup(of_get_property(np, #dma-cells, NULL));
- if (!nbcells) {
+ parent = of_get_property(np, #dma-cells, NULL);
+ if (parent)
+ nbcells = be32_to_cpup(parent);
+ if (!parent || !nbcells) {
pr_err(%s: #dma-cells property is missing or invalid\n,
__func__);
kfree(ofdma);
--
1.7.10.4
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH] dma: of-dma: check OF pointer property before dereferencing
Unable to handle kernel NULL pointer dereference at virtual address pgd = c0004000 [] *pgd= Internal error: Oops: 5 [#1] SMP ARM CPU: 0Tainted: GW (3.9.0-rc739rc7fix1-dirty #10) PC is at of_dma_controller_register+0xb8/0x11c LR is at of_find_property+0x44/0x4c pc : [c01adf8c]lr : [c0281754]psr: 6113 sp : ef043e40 ip : fp : c01af774 r10: ef015550 r9 : c01af5c0 r8 : r7 : c01afb40 r6 : ef120400 r5 : c48613dc r4 : ef02e900 r3 : r2 : 0023 r1 : a113 r0 : Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel Control: 10c5387d Table: 404a DAC: 0015 Process swapper/0 (pid: 1, stack limit = 0xef042238) Stack: (0xef043e40 to 0xef044000) 3e40: ef015550 ef01558c ef120400 c01affe4 c01af5c0 ef015584 c01b1170 3e60: ef015550 c033ca54 c48613dc c033ca54 007c 00041308 ef103d80 3e80: a113 ef012440 c03bc7d4 ef120400 c03bc780 c03bc780 3ea0: c038c000 c01ac1f4 c01ac16c ef120400 c03fa67c c03fa684 3ec0: c01d9570 ef120400 c03bc780 ef120434 008b c01d9718 3ee0: c03bc780 c01d968c c01d7ce4 ef0c2558 ef0eefb4 ef02b100 c03bc780 3f00: c03bc64c c01d8450 c033cfa8 c03bc1e0 c03bc780 c0398e48 c03a0784 c03cab40 3f20: 008b c01d9ce8 0006 c0398e48 c03a0784 c03cab40 008b 3f40: c0377878 0006 0006 c03b25a4 0006 0006 c0398e48 3f60: c03a0784 c03cab40 008b c0398e54 c037727c c0377a44 0006 0006 3f80: c037727c c02bb874 3fa0: c02bb87c c000dfd8 3fc0: 3fe0: 0013 [c01adf8c] (of_dma_controller_register+0xb8/0x11c) from [c01b1170] (pl330_probe+0x740/0xa9c) [c01b1170] (pl330_probe+0x740/0xa9c) from [c01ac1f4] (amba_probe+0x88/0xa0) [c01ac1f4] (amba_probe+0x88/0xa0) from [c01d9570] (driver_probe_device+0xf8/0x214) [c01d9570] (driver_probe_device+0xf8/0x214) from [c01d9718] (__driver_attach+0x8c/0x90) [c01d9718] (__driver_attach+0x8c/0x90) from [c01d7ce4] (bus_for_each_dev+0x54/0x88) [c01d7ce4] (bus_for_each_dev+0x54/0x88) from [c01d8450] (bus_add_driver+0xdc/0x230) [c01d8450] (bus_add_driver+0xdc/0x230) from [c01d9ce8] (driver_register+0x78/0x14c) [c01d9ce8] (driver_register+0x78/0x14c) from [c0377878] (do_one_initcall+0x90/0x160) [c0377878] (do_one_initcall+0x90/0x160) from [c0377a44] (kernel_init_freeable+0xfc/0x1c4) [c0377a44] (kernel_init_freeable+0xfc/0x1c4) from [c02bb87c] (kernel_init+0x8/0xe4) [c02bb87c] (kernel_init+0x8/0xe4) from [c000dfd8] (ret_from_fork+0x14/0x3c) Code: e1a8 e8bd87f0 e3a04010 eae0 (e5909000) ---[ end trace 1b75b31a2719ed1e ]--- Kernel panic - not syncing: Attempted to kill init! exitcode=0x000b Paolo Pisati (1): dma: of-dma: check OF pointer property before dereferencing it drivers/dma/of-dma.c |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 1.7.10.4 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] dma: of-dma: check OF pointer property before dereferencing it
On 04/15/2013 10:39 AM, Paolo Pisati wrote:
Signed-off-by: Paolo Pisati paolo.pis...@canonical.com
That should already be fixed in the DMA tree. See commit 7362f04c28 (DMA:
OF: Check properties value before running be32_to_cpup() on it).
- Lars
---
drivers/dma/of-dma.c |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c
index 69d04d2..9628298 100644
--- a/drivers/dma/of-dma.c
+++ b/drivers/dma/of-dma.c
@@ -91,6 +91,7 @@ int of_dma_controller_register(struct device_node *np,
(struct of_phandle_args *, struct of_dma *),
void *data)
{
+ void*parent;
struct of_dma *ofdma;
int nbcells;
@@ -103,8 +104,10 @@ int of_dma_controller_register(struct device_node *np,
if (!ofdma)
return -ENOMEM;
- nbcells = be32_to_cpup(of_get_property(np, #dma-cells, NULL));
- if (!nbcells) {
+ parent = of_get_property(np, #dma-cells, NULL);
+ if (parent)
+ nbcells = be32_to_cpup(parent);
+ if (!parent || !nbcells) {
pr_err(%s: #dma-cells property is missing or invalid\n,
__func__);
kfree(ofdma);
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
