linux-kernel - Re: [PATCH] char/nvram: Use bitwise OR to obtain Atari video mode data

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAMuHMdUF5NWHcUgxyLisSSPts1PBvC2dFANeEA4DTs1zCCqjAQ@mail.gmail.com>
Date:	Fri, 3 Jul 2015 08:52:03 +0200
From:	Geert Uytterhoeven <geert@...ux-m68k.org>
To:	Finn Thain <fthain@...egraphics.com.au>
Cc:	Arnd Bergmann <arnd@...db.de>,
	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"Linux/m68k" <linux-m68k@...r.kernel.org>
Subject: Re: [PATCH] char/nvram: Use bitwise OR to obtain Atari video mode data

On Fri, Jul 3, 2015 at 5:35 AM, Finn Thain <fthain@...egraphics.com.au> wrote:
> Signed-off-by: Finn Thain <fthain@...egraphics.com.au>

Nice catch!

Acked-by: Geert Uytterhoeven <geert@...ux-m68k.org>

> Index: linux/drivers/char/nvram.c
> ===================================================================
> --- linux.orig/drivers/char/nvram.c     2015-07-02 13:50:40.000000000 +1000
> +++ linux/drivers/char/nvram.c  2015-07-02 14:00:05.000000000 +1000
> @@ -702,7 +702,7 @@ static void atari_proc_infos(unsigned ch
>                 seq_printf(seq, "%ds%s\n", nvram[10],
>                     nvram[10] < 8 ? ", no memory test" : "");
>
> -       vmode = (nvram[14] << 8) || nvram[15];
> +       vmode = (nvram[14] << 8) | nvram[15];
>         seq_printf(seq,
>             "Video mode       : %s colors, %d columns, %s %s monitor\n",
>             colors[vmode & 7],

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@...ux-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 linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/