[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CALCETrXV3rHb7Z8iaoieAJ5hRY0+UT7eTknxe4-FiOoke9XoGg@mail.gmail.com>
Date: Tue, 6 Feb 2018 20:49:39 +0000
From: Andy Lutomirski <luto@...nel.org>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Dan Williams <dan.j.williams@...el.com>, Luis Henriques <lhenriques@...e.com>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, linux-arch <linux-arch@...r.kernel.org>,
Kernel Hardening <kernel-hardening@...ts.openwall.com>, Greg KH <gregkh@...uxfoundation.org>,
X86 ML <x86@...nel.org>, Ingo Molnar <mingo@...hat.com>, Andy Lutomirski <luto@...nel.org>,
"H. Peter Anvin" <hpa@...or.com>, Thomas Gleixner <tglx@...utronix.de>,
Andrew Morton <akpm@...ux-foundation.org>, Alan Cox <alan@...ux.intel.com>
Subject: Re: [PATCH v4 07/10] x86: narrow out of bounds syscalls to sys_read
under speculation
On Tue, Feb 6, 2018 at 8:42 PM, Linus Torvalds
<torvalds@...ux-foundation.org> wrote:
> On Tue, Feb 6, 2018 at 12:37 PM, Dan Williams <dan.j.williams@...el.com> wrote:
>>
>> Are there any compilers that would miscompile:
>>
>> mask = 0 - (index < size);
>>
>> That might be a way to improve the assembly.
>
> Sadly, that is *very* easy to miscompile. In fact, I'd be very
> surprised indeed if any compiler worth its name wouldn't combine the
> comparison with the conditional branch it accompanies, and just turn
> that into a constant. IOW, you'd get
>
> mask = 0 - (index < size);
> if (index <= size) {
> ... use mask ..
>
> and the compiler would just turn that into
>
> if (index <= size) {
> mask = -1;
>
> and be done with it.
>
> Linus
Can you use @cc to make an asm statement that outputs both the masked
array index and the "if" condition? I can never remember the syntax,
but something like:
asm ("cmp %[limit], %[index]\n\tcmovae %[zero], %[index]" : [index]
"+" (index), "@ccb" (result));
Then you shove this into a statement expression macro so you can do:
if (index_mask_nospec(&nr, NR_syscalls)) {
... sys_call_table[nr] ..;
}
(Caveat emptor: I can also *ever* remember which way the $*!& AT&T
syntax cmp instruction goes.)
A down side is that nr actually ends up containing zero outside the
if. *That* could be avoided with jump labels.
--Andy
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
