ARM: pl330: fix null pointer dereference in pl330_chan_ctrl()
Subsystems (2)
PATCH 1/1 ARM: pl330: fix null pointer dereference in pl330_chan_ctrl()
This fixes the thrd->req_running field being accessed before thrd is checked for null. The error was introduced in abb959f.
--- arch/arm/common/pl330.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
arch/arm/common/pl330.c +2 -1
@@ -1496,12 +1496,13 @@ int pl330_chan_ctrl(void *ch_id, enum pl330_chan_op op)struct pl330_thread *thrd = ch_id;struct pl330_dmac *pl330;unsigned long flags; -int ret =0 , active = thrd->req_running; +int ret =0 , active;if (!thrd || thrd->free || thrd->dmac->state ==DYING )return -EINVAL ; pl330 = thrd->dmac; + active = thrd->req_running;spin_lock_irqsave (&pl330->lock, flags);
Signature · 1 line
1.7.8.3
Quoted 4 lines · Mans Rullgard
This fixes the
thrd->req_runningfield being accessed before thrd is checked for null. The error was introduced in abb959f.Signed-off-by Mans Rullgard <[email protected]>
I don't know what's happening with the PL330 driver, but there's patches around to remove this file and merge it with the DMA engine driver.
PATCH 1/1 ARM: pl330: fix null pointer dereference in pl330_chan_ctrl()
Quoted 8 lines · Russell King - ARM Linux
Quoted 4 lines · Mans Rullgard
This fixes the
thrd->req_runningfield being accessed before thrd is checked for null. The error was introduced in abb959f.Signed-off-by Mans Rullgard <[email protected]>I don't know what's happening with the PL330 driver, but there's patches around to remove this file and merge it with the DMA engine driver.
The PL330 merge didn't happen in the 3.3 merge window and I can't see it in linux-next, so linux 3.3 will ship with the driver still split in arch/arm/common/pl330.c and drivers/dma/pl330.c . I think this patch should be part of linux 3.3 (and you should add "Cc: stable at kernel.org" so that it's included in the next 3.2 stable release).
Unless somebody thinks otherwise, Mans, can you please submit it to rmk's patch tracking system?
http://www.arm.linux.org.uk/developer/patches/
Thanks,
Javi
PATCH 1/1 ARM: pl330: fix null pointer dereference in pl330_chan_ctrl()
Quoted 10 lines · Javi Merino
Quoted 8 lines · Russell King - ARM Linux
Quoted 4 lines · Mans Rullgard
This fixes the
thrd->req_runningfield being accessed before thrd is checked for null. The error was introduced in abb959f.Signed-off-by Mans Rullgard <[email protected]>I don't know what's happening with the PL330 driver, but there's patches around to remove this file and merge it with the DMA engine driver.
Quoted 8 lines
The PL330 merge didn't happen in the 3.3 merge window and I can't see it in linux-next, so linux 3.3 will ship with the driver still split in
arch/arm/common/pl330.canddrivers/dma/pl330.c. I think this patch should be part of linux 3.3 (and you should add "Cc: stable at kernel.org" so that it's included in the next 3.2 stable release).Unless somebody thinks otherwise, Mans, can you please submit it to rmk's patch tracking system?
I rebased your patch based on pl330 merge commit with kukjin kim. And confirmed to working it well. You can check it on below URL.git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git v3.4-for-vkou
As I know, Kukjin kim will send a pull request to DMA and ARM SoC trees soon.
Quoted 11 lines
http://www.arm.linux.org.uk/developer/patches/
Thanks,
Javi_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 1/1 ARM: pl330: fix null pointer dereference in pl330_chan_ctrl()
Quoted 18 lines · Boojin Kim
Quoted 16 lines · Javi Merino
Quoted 8 lines · Russell King - ARM Linux
Quoted 4 lines · Mans Rullgard
This fixes the
thrd->req_runningfield being accessed before thrd is checked for null. The error was introduced in abb959f.Signed-off-by Mans Rullgard <[email protected]>I don't know what's happening with the PL330 driver, but there's patches around to remove this file and merge it with the DMA engine driver.
The PL330 merge didn't happen in the 3.3 merge window and I can't see it in linux-next, so linux 3.3 will ship with the driver still split in
arch/arm/common/pl330.canddrivers/dma/pl330.c. I think this patch should be part of linux 3.3 (and you should add "Cc: stable at kernel.org" so that it's included in the next 3.2 stable release).
Quoted 4 lines
Quoted 2 lines
Unless somebody thinks otherwise, Mans, can you please submit it to rmk's patch tracking system?
I rebased your patch based on pl330 merge commit with kukjin kim. And confirmed to working it well. You can check it on below URL.
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.gitv3.4-for-vkou
Sorry, I wasn't talking about my patch but Mans':
http://article.gmane.org/gmane.linux.linaro.devel/9445
It fixes a null pointer dereference in the current kernel and I still think it should go into 3.3 and in the next 3.2 stable release. That will create another conflict in your tree I'm afraid.
Cheers,
Javi
Quoted 6 lines · Mans Rullgard
This fixes the
thrd->req_runningfield being accessed before thrd is checked for null. The error was introduced in abb959f.Signed-off-by Mans Rullgard <[email protected]>--- arch/arm/common/pl330.c | 3 ++-
As Russell points out, the s5p tree has merged this file with drivers/dma/pl330.c so this bug is now in that file. Please rebase the patch on top of linux-next.
Other than that, yes, that's my fault.
Quoted 21 lines
1 files changed, 2 insertions(+), 1 deletions(-)arch/arm/common/pl330.c +2
-1@@ -1496,12 +1496,13 @@ int pl330_chan_ctrl(void *ch_id, enum pl330_chan_op op)struct pl330_thread *thrd = ch_id;struct pl330_dmac *pl330;unsigned long flags; -int ret =0 , active = thrd->req_running; +int ret =0 , active;if (!thrd || thrd->free || thrd->dmac->state ==DYING )return -EINVAL ; pl330 = thrd->dmac; + active = thrd->req_running;spin_lock_irqsave (&pl330->lock, flags);
PATCH 1/1 ARM: pl330: fix null pointer dereference in pl330_chan_ctrl()
This fixes the thrd->req_running field being accessed before thrd is checked for null. The error was introduced in abb959f.
--- drivers/dma/pl330.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/dma/pl330.c +2 -1
@@ -1568,12 +1568,13 @@ static int pl330_chan_ctrl(void *ch_id, enum pl330_chan_op op)struct pl330_thread *thrd = ch_id;struct pl330_dmac *pl330;unsigned long flags; -int ret =0 , active = thrd->req_running; +int ret =0 , active;if (!thrd || thrd->free || thrd->dmac->state ==DYING )return -EINVAL ; pl330 = thrd->dmac; + active = thrd->req_running;spin_lock_irqsave (&pl330->lock, flags);
Signature · 1 line
1.7.8.3
Hello.
Quoted 2 lines · Mans Rullgard
This fixes the
thrd->req_runningfield being accessed before thrd is checked for null. The error was introduced in abb959f.
Please also specify summary of that commit in parens.
Quoted 1 line
Signed-off-by Mans Rullgard<[email protected]>
WBR, Sergei
PATCH 1/1 DMA: pl330: fix null pointer dereference in pl330_chan_ctrl()
This fixes the thrd->req_running field being accessed before thrd is checked for null. The error was introduced in abb959f (ARM: 7237/1: PL330: Fix driver freeze).
--- drivers/dma/pl330.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/dma/pl330.c +2 -1
@@ -1568,12 +1568,13 @@ static int pl330_chan_ctrl(void *ch_id, enum pl330_chan_op op)struct pl330_thread *thrd = ch_id;struct pl330_dmac *pl330;unsigned long flags; -int ret =0 , active = thrd->req_running; +int ret =0 , active;if (!thrd || thrd->free || thrd->dmac->state ==DYING )return -EINVAL ; pl330 = thrd->dmac; + active = thrd->req_running;spin_lock_irqsave (&pl330->lock, flags);
Signature · 1 line
1.7.8.4