[PATCH 1/2] TTY: pmac_zilog, check existence of ports in pmz_console_init()

[PATCH 1/2] TTY: pmac_zilog, check existence of ports in pmz_console_init()

[Geert Uytterhoeven]

When booting a multi-platform m68k kernel on a non-Mac with "console=ttyS0"
on the kernel command line, it crashes with:

Unable to handle kernel NULL pointer dereference at virtual address   (null)
Oops: 00000000
PC: [<0013ad28>] __pmz_startup+0x32/0x2a0
...
Call Trace: [<002c5d3e>] pmz_console_setup+0x64/0xe4

The normal tty driver doesn't crash, because init_pmz() checks
pmz_ports_count again after calling pmz_probe().

In the serial console initialization path, pmz_console_init() doesn't do
this, causing the driver to crash later.

Add a check for pmz_ports_count to fix this.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Finn Thain <fthain@telegraphics.com.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
 drivers/tty/serial/pmac_zilog.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index 481b781b26e3..e9d420ff3931 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -2052,6 +2052,9 @@ static int __init pmz_console_init(void)
 	/* Probe ports */
 	pmz_probe();
 
+	if (pmz_ports_count == 0)
+		return -ENODEV;
+
 	/* TODO: Autoprobe console based on OF */
 	/* pmz_console.index = i; */
 	register_console(&pmz_console);
-- 
1.7.9.5

[PATCH 2/2] TTY: amiserial, add missing platform check

[Geert Uytterhoeven]

When booting a multi-platform m68k kernel on a non-Amiga with
"console=ttyS0" on the kernel command line, it crashes with:

Unable to handle kernel access at virtual address 81dff01c
Oops: 00000000
PC: [<001e09a8>] serial_console_write+0xc/0x70

Add the missing platform check to amiserial_console_init() to fix this.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 drivers/tty/amiserial.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c
index 2b86f8e0fb58..71630a2af42c 100644
--- a/drivers/tty/amiserial.c
+++ b/drivers/tty/amiserial.c
@@ -1855,6 +1855,9 @@ static struct console sercons = {
  */
 static int __init amiserial_console_init(void)
 {
+	if (!MACH_IS_AMIGA)
+		return -ENODEV;
+
 	register_console(&sercons);
 	return 0;
 }
-- 
1.7.9.5

Re: [PATCH 1/2] TTY: pmac_zilog, check existence of ports in pmz_console_init()

[Geert Uytterhoeven]

On Fri, Nov 22, 2013 at 4:47 PM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> When booting a multi-platform m68k kernel on a non-Mac with "console=ttyS0"
> on the kernel command line, it crashes with:

Can we please get this in stable, too?

commit dc1dc2f8a5dd863bf2e79f338fc3ae29e99c683a

Thanks!

> Unable to handle kernel NULL pointer dereference at virtual address   (null)
> Oops: 00000000
> PC: [<0013ad28>] __pmz_startup+0x32/0x2a0
> ...
> Call Trace: [<002c5d3e>] pmz_console_setup+0x64/0xe4
>
> The normal tty driver doesn't crash, because init_pmz() checks
> pmz_ports_count again after calling pmz_probe().
>
> In the serial console initialization path, pmz_console_init() doesn't do
> this, causing the driver to crash later.
>
> Add a check for pmz_ports_count to fix this.
>
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Cc: Finn Thain <fthain@telegraphics.com.au>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>

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

Re: [PATCH 1/2] TTY: pmac_zilog, check existence of ports in pmz_console_init()

[Greg Kroah-Hartman]

On Tue, Dec 24, 2013 at 03:39:50PM +0100, Geert Uytterhoeven wrote:
> On Fri, Nov 22, 2013 at 4:47 PM, Geert Uytterhoeven
> <geert@linux-m68k.org> wrote:
> > When booting a multi-platform m68k kernel on a non-Mac with "console=ttyS0"
> > on the kernel command line, it crashes with:
> 
> Can we please get this in stable, too?
> 
> commit dc1dc2f8a5dd863bf2e79f338fc3ae29e99c683a

Now applied, thanks.

greg k-h

Re: [PATCH 1/2] TTY: pmac_zilog, check existence of ports in pmz_console_init()

[Luis Henriques]

On Tue, Dec 24, 2013 at 03:39:50PM +0100, Geert Uytterhoeven wrote:
> On Fri, Nov 22, 2013 at 4:47 PM, Geert Uytterhoeven
> <geert@linux-m68k.org> wrote:
> > When booting a multi-platform m68k kernel on a non-Mac with "console=ttyS0"
> > on the kernel command line, it crashes with:
> 
> Can we please get this in stable, too?
> 
> commit dc1dc2f8a5dd863bf2e79f338fc3ae29e99c683a
> 
> Thanks!

Thanks Geert, I'm queuing it for the 3.5 and 3.11 kernels as well.

Cheers,
--
Luis

> > Unable to handle kernel NULL pointer dereference at virtual address   (null)
> > Oops: 00000000
> > PC: [<0013ad28>] __pmz_startup+0x32/0x2a0
> > ...
> > Call Trace: [<002c5d3e>] pmz_console_setup+0x64/0xe4
> >
> > The normal tty driver doesn't crash, because init_pmz() checks
> > pmz_ports_count again after calling pmz_probe().
> >
> > In the serial console initialization path, pmz_console_init() doesn't do
> > this, causing the driver to crash later.
> >
> > Add a check for pmz_ports_count to fix this.
> >
> > Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> > Cc: Finn Thain <fthain@telegraphics.com.au>
> > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> 
> 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
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/2] TTY: pmac_zilog, check existence of ports in pmz_console_init()

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 543 bytes --]

On Tue, 2013-12-24 at 15:39 +0100, Geert Uytterhoeven wrote:
> On Fri, Nov 22, 2013 at 4:47 PM, Geert Uytterhoeven
> <geert@linux-m68k.org> wrote:
> > When booting a multi-platform m68k kernel on a non-Mac with "console=ttyS0"
> > on the kernel command line, it crashes with:
> 
> Can we please get this in stable, too?
> 
> commit dc1dc2f8a5dd863bf2e79f338fc3ae29e99c683a
[...]

I've queued this up for 3.2; sorry for the delay.

Ben.

-- 
Ben Hutchings
If more than one person is responsible for a bug, no one is at fault.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 811 bytes --]