2017-03-10 02:34:03

by Larry Finger

[permalink] [raw]
Subject: [PATCH] powerpc: Fix crash introduced with commit 5657933dbb6e

Code inserted during the code merged between kernels 4.10 and 4.11-rc1
caused an early panic quickly followed by a complete shutdown for
PowerPC. The traceback was not displayed long enough to read or
photograph, thus it is not reproduced here.

The problem was bisected to commit 5657933dbb6e ("treewide: Move dma_ops
from struct dev_archdata into struct device"). The problem was a missing
copy of critical information from struct dev_archdata into struct device,
leading to the dereference of a null pointer.

This fix was suggested by Benjamin Herrenschmidt.

Fixes: commit 5657933dbb6e ("treewide: Move dma_ops from struct dev_archdata into struct device")
Signed-off-by: Larry Finger <[email protected]>
Cc: [email protected]
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: [email protected] <[email protected]>

drivers/macintosh/macio_asic.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index 3f041b1..f757cef2 100644
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -392,6 +392,7 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
* To get all the fields, copy all archdata
*/
dev->ofdev.dev.archdata = chip->lbus.pdev->dev.archdata;
+ dev->ofdev.dev.dma_ops = chip->lbus.pdev->dev.dma_ops;
#endif /* CONFIG_PCI */

#ifdef DEBUG
--
2.10.2


2017-03-11 17:07:31

by Linus Torvalds

[permalink] [raw]
Subject: Re: [PATCH] powerpc: Fix crash introduced with commit 5657933dbb6e

On Thu, Mar 9, 2017 at 6:33 PM, Larry Finger <[email protected]> wrote:
>
> The problem was bisected to commit 5657933dbb6e ("treewide: Move dma_ops
> from struct dev_archdata into struct device"). The problem was a missing
> copy of critical information from struct dev_archdata into struct device,
> leading to the dereference of a null pointer.
>
> This fix was suggested by Benjamin Herrenschmidt.

I'm assuming I'll be getting this through the powerpc tree. Holler if
that isn't the case.

Linus

2017-03-14 11:46:04

by Michael Ellerman

[permalink] [raw]
Subject: Re: powerpc: Fix crash introduced with commit 5657933dbb6e

On Fri, 2017-03-10 at 02:33:51 UTC, Larry Finger wrote:
> Code inserted during the code merged between kernels 4.10 and 4.11-rc1
> caused an early panic quickly followed by a complete shutdown for
> PowerPC. The traceback was not displayed long enough to read or
> photograph, thus it is not reproduced here.
>
> The problem was bisected to commit 5657933dbb6e ("treewide: Move dma_ops
> from struct dev_archdata into struct device"). The problem was a missing
> copy of critical information from struct dev_archdata into struct device,
> leading to the dereference of a null pointer.
>
> This fix was suggested by Benjamin Herrenschmidt.
>
> Fixes: commit 5657933dbb6e ("treewide: Move dma_ops from struct dev_archdata into struct device")
> Signed-off-by: Larry Finger <[email protected]>
> Cc: [email protected]
> Cc: Benjamin Herrenschmidt <[email protected]>
> Cc: [email protected] <[email protected]>

Applied to powerpc fixes, thanks.

https://git.kernel.org/powerpc/c/46f401c4297a2232a037ad8801b6c8

cheers