From: Dan Williams <dan.j.williams@intel.com>
To: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Andrew Morton <akpm@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Alexei Starovoitov <ast@kernel.org>,
Peter Zijlstra <peterz@infradead.org>
Subject: Re: [PATCH] kernel: sys: fix potential Spectre v1
Date: Tue, 22 May 2018 22:15:50 -0700 [thread overview]
Message-ID: <CAPcyv4jJ6g7nOAv4hV9RtduiDmdK=MPuE1tzybVROmH3S6994A@mail.gmail.com> (raw)
In-Reply-To: <112349fb-837c-7b91-e256-a1c443710150@embeddedor.com>
On Tue, May 22, 2018 at 10:03 PM, Gustavo A. R. Silva
<gustavo@embeddedor.com> wrote:
>
>
> On 05/22/2018 03:50 PM, Dan Williams wrote:
>>>>
>>>>
>>>> Dan,
>>>>
>>>> What do you think about this first draft:
>>>>
>>>> diff --git a/include/linux/nospec.h b/include/linux/nospec.h
>>>> index e791ebc..6154183 100644
>>>> --- a/include/linux/nospec.h
>>>> +++ b/include/linux/nospec.h
>>>> @@ -55,4 +55,16 @@ static inline unsigned long
>>>> array_index_mask_nospec(unsigned long index,
>>>>
>>>> \
>>>> (typeof(_i)) (_i & _mask);
>>>> \
>>>> })
>>>> +
>>>> +#define validate_index_nospec(index, size) \
>>>> +({ \
>>>> + typeof(index) *ptr = &(index); \
>>>> + typeof(size) _s = (size); \
>>>> + \
>>>> + BUILD_BUG_ON(sizeof(*ptr) > sizeof(long)); \
>>>> + BUILD_BUG_ON(sizeof(_s) > sizeof(long)); \
>>>> + \
>>>> + *ptr >= _s ? false : \
>>>> + (*ptr = array_index_nospec(*ptr, _s) ? true : true); \
>>>
>>>
>>>
>>> This actually should be:
>>>
>>> ((*ptr = array_index_nospec(*ptr, _s)) ? true : true);
>>>
>>
>> Let's not use ternary conditionals at all to make this more readable.
>>
>
> OK. How about this:
>
> diff --git a/include/linux/nospec.h b/include/linux/nospec.h
> index e791ebc..498995b 100644
> --- a/include/linux/nospec.h
> +++ b/include/linux/nospec.h
> @@ -55,4 +55,21 @@ static inline unsigned long
> array_index_mask_nospec(unsigned long index,
> \
> (typeof(_i)) (_i & _mask); \
> })
> +
> +#define validate_index_nospec(index, size) \
> +({ \
> + bool ret = true; \
> + typeof(index) *ptr = &(index); \
> + typeof(size) _s = (size); \
> + \
> + BUILD_BUG_ON(sizeof(*ptr) > sizeof(long)); \
> + BUILD_BUG_ON(sizeof(_s) > sizeof(long)); \
> + \
> + if (*ptr >= size) \
> + ret = false; \
> + \
> + *ptr = array_index_nospec(*ptr, _s); \
> + \
> + ret; \
>
> +})
> #endif /* _LINUX_NOSPEC_H */
Assuming the assembly generation is comparable with the open coded
version, this looks ok to me.
next prev parent reply other threads:[~2018-05-23 5:15 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-15 3:00 [PATCH] kernel: sys: fix potential Spectre v1 Gustavo A. R. Silva
2018-05-15 22:08 ` Andrew Morton
2018-05-15 22:29 ` Thomas Gleixner
2018-05-15 22:57 ` Dan Williams
2018-05-18 19:04 ` Gustavo A. R. Silva
2018-05-18 19:21 ` Gustavo A. R. Silva
2018-05-18 20:38 ` Dan Williams
2018-05-18 20:44 ` Gustavo A. R. Silva
2018-05-18 21:27 ` Gustavo A. R. Silva
2018-05-18 21:45 ` Dan Williams
2018-05-18 22:01 ` Gustavo A. R. Silva
2018-05-18 22:08 ` Dan Williams
2018-05-18 22:11 ` Gustavo A. R. Silva
2018-05-21 0:50 ` Gustavo A. R. Silva
2018-05-21 2:00 ` Gustavo A. R. Silva
2018-05-22 20:50 ` Dan Williams
2018-05-23 5:03 ` Gustavo A. R. Silva
2018-05-23 5:15 ` Dan Williams [this message]
2018-05-23 5:22 ` Gustavo A. R. Silva
2018-05-23 9:08 ` Peter Zijlstra
2018-05-23 13:55 ` Dan Williams
2018-05-23 15:07 ` Mark Rutland
2018-05-23 15:57 ` Dan Williams
2018-05-23 16:27 ` Peter Zijlstra
2018-05-23 16:31 ` Mark Rutland
2018-05-25 18:11 ` Gustavo A. R. Silva
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAPcyv4jJ6g7nOAv4hV9RtduiDmdK=MPuE1tzybVROmH3S6994A@mail.gmail.com' \
--to=dan.j.williams@intel.com \
--cc=akpm@linux-foundation.org \
--cc=ast@kernel.org \
--cc=gustavo@embeddedor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).