From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
To: Dan Williams <dan.j.williams@intel.com>, linux-kernel@vger.kernel.org
Cc: linux-arch@vger.kernel.org, gregkh@linuxfoundation.org,
peterz@infradead.org, netdev@vger.kernel.org,
Eduardo Valentin <edubezval@gmail.com>,
Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>,
Zhang Rui <rui.zhang@intel.com>,
torvalds@linux-foundation.org, tglx@linutronix.de,
Elena Reshetova <elena.reshetova@intel.com>,
alan@linux.intel.com
Subject: Re: [PATCH 12/18] Thermal/int340x: prevent bounds-check bypass via speculative execution
Date: Sat, 6 Jan 2018 13:03:22 +0300 [thread overview]
Message-ID: <b1d114af-c0ba-63f5-0905-86128d3c0b3a@cogentembedded.com> (raw)
In-Reply-To: <151520105920.32271.1091443154687576996.stgit@dwillia2-desk3.amr.corp.intel.com>
On 1/6/2018 4:10 AM, Dan Williams wrote:
> Static analysis reports that 'trip' may be a user controlled value that
> is used as a data dependency to read '*temp' from the 'd->aux_trips'
> array. In order to avoid potential leaks of kernel memory values, block
> speculative execution of the instruction stream that could issue reads
> based on an invalid value of '*temp'.
>
> Based on an original patch by Elena Reshetova.
>
> Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
> Cc: Zhang Rui <rui.zhang@intel.com>
> Cc: Eduardo Valentin <edubezval@gmail.com>
> Signed-off-by: Elena Reshetova <elena.reshetova@intel.com>
> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
> ---
> .../thermal/int340x_thermal/int340x_thermal_zone.c | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/thermal/int340x_thermal/int340x_thermal_zone.c b/drivers/thermal/int340x_thermal/int340x_thermal_zone.c
> index 145a5c53ff5c..442a1d9bf7ad 100644
> --- a/drivers/thermal/int340x_thermal/int340x_thermal_zone.c
> +++ b/drivers/thermal/int340x_thermal/int340x_thermal_zone.c
[...]
> @@ -52,20 +53,21 @@ static int int340x_thermal_get_trip_temp(struct thermal_zone_device *zone,
> int trip, int *temp)
> {
> struct int34x_thermal_zone *d = zone->devdata;
> + unsigned long *elem;
> int i;
>
> if (d->override_ops && d->override_ops->get_trip_temp)
> return d->override_ops->get_trip_temp(zone, trip, temp);
>
> - if (trip < d->aux_trip_nr)
> - *temp = d->aux_trips[trip];
> - else if (trip == d->crt_trip_id)
> + if ((elem = nospec_array_ptr(d->aux_trips, trip, d->aux_trip_nr))) {
And here...
> + *temp = *elem;
> + } else if (trip == d->crt_trip_id) {
> *temp = d->crt_temp;
> - else if (trip == d->psv_trip_id)
> + } else if (trip == d->psv_trip_id) {
> *temp = d->psv_temp;
> - else if (trip == d->hot_trip_id)
> + } else if (trip == d->hot_trip_id) {
> *temp = d->hot_temp;
> - else {
> + } else {
> for (i = 0; i < INT340X_THERMAL_MAX_ACT_TRIP_COUNT; i++) {
> if (d->act_trips[i].valid &&
> d->act_trips[i].id == trip) {
MBR, Sergei
next prev parent reply other threads:[~2018-01-06 10:03 UTC|newest]
Thread overview: 161+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-06 1:09 [PATCH 00/18] prevent bounds-check bypass via speculative execution Dan Williams
2018-01-06 1:09 ` [PATCH 01/18] asm-generic/barrier: add generic nospec helpers Dan Williams
2018-01-06 2:55 ` Linus Torvalds
2018-01-06 5:23 ` Dan Williams
2018-01-06 17:08 ` Mark Rutland
2018-01-06 1:10 ` [PATCH 02/18] Documentation: document " Dan Williams
2018-01-08 16:29 ` Jonathan Corbet
2018-01-08 17:09 ` Mark Rutland
2018-01-08 21:19 ` Jonathan Corbet
2018-01-06 1:10 ` [PATCH 03/18] arm64: implement nospec_ptr() Dan Williams
2018-01-06 1:10 ` [PATCH 04/18] arm: " Dan Williams
2018-01-10 2:04 ` Laura Abbott
2018-01-10 7:40 ` Hanjun Guo
2018-01-10 17:24 ` Laura Abbott
2018-01-06 1:10 ` [PATCH 05/18] x86: implement nospec_barrier() Dan Williams
2018-01-06 1:10 ` [PATCH 06/18] x86, barrier: stop speculation for failed access_ok Dan Williams
2018-01-06 2:52 ` Linus Torvalds
2018-01-06 3:09 ` Linus Torvalds
2018-01-06 23:31 ` Dan Williams
2018-01-07 1:20 ` Linus Torvalds
2018-01-08 21:09 ` Dan Williams
2018-01-08 23:44 ` Linus Torvalds
2018-01-08 23:53 ` Dan Williams
2018-01-06 5:47 ` Dan Williams
2018-01-06 12:32 ` Alan Cox
2018-01-06 17:56 ` Linus Torvalds
2018-01-06 18:13 ` Alexei Starovoitov
2018-01-06 18:29 ` Dan Williams
2018-01-06 18:39 ` Alexei Starovoitov
2018-01-06 18:54 ` Dan Williams
2018-01-06 19:25 ` Alexei Starovoitov
2018-01-06 19:36 ` Dan Williams
2018-01-06 19:41 ` Thomas Gleixner
2018-01-08 10:02 ` Andrea Arcangeli
2018-01-06 18:38 ` Alan Cox
2018-01-06 18:51 ` Alexei Starovoitov
2018-01-06 19:55 ` Alan Cox
2018-01-06 20:09 ` Alexei Starovoitov
2018-01-06 20:22 ` Alan Cox
2018-01-06 21:17 ` Alexei Starovoitov
2018-01-06 21:21 ` Thomas Gleixner
2018-01-06 23:05 ` Alan Cox
2018-01-07 3:38 ` Alexei Starovoitov
2018-01-07 6:33 ` Willy Tarreau
2018-01-07 19:47 ` Linus Torvalds
2018-01-07 20:12 ` Willy Tarreau
2018-01-07 20:17 ` Linus Torvalds
2018-01-07 20:56 ` Thomas Gleixner
2018-01-08 2:23 ` David Miller
2018-01-08 7:38 ` Greg KH
2018-01-07 22:15 ` Willy Tarreau
2018-01-07 20:15 ` Dan Williams
2018-01-08 2:24 ` Alexei Starovoitov
2018-01-08 9:51 ` Peter Zijlstra
2018-01-08 18:21 ` Ingo Molnar
2018-01-08 12:00 ` David Laight
2018-01-08 12:12 ` Alan Cox
2018-01-08 12:33 ` David Laight
2018-01-07 10:08 ` Thomas Gleixner
2018-01-08 2:09 ` Alexei Starovoitov
2018-01-07 13:59 ` Alan Cox
2018-01-08 2:57 ` Alexei Starovoitov
2018-01-08 9:57 ` Peter Zijlstra
2018-01-06 20:42 ` Willy Tarreau
2018-01-07 1:36 ` David Miller
2018-01-07 17:19 ` James Bottomley
2018-01-07 18:31 ` Thomas Gleixner
2018-01-08 2:04 ` David Miller
2018-01-07 19:24 ` Alan Cox
2018-01-09 21:41 ` Josh Poimboeuf
2018-01-09 21:47 ` Dan Williams
2018-01-09 21:49 ` Josh Poimboeuf
2018-01-09 21:59 ` Dan Williams
2018-01-09 22:23 ` Josh Poimboeuf
2018-01-09 22:35 ` Dan Williams
2018-01-06 1:10 ` [PATCH 07/18] [media] uvcvideo: prevent bounds-check bypass via speculative execution Dan Williams
2018-01-06 9:09 ` Greg KH
2018-01-06 9:40 ` Greg KH
2018-01-06 17:41 ` Dan Williams
2018-01-07 9:09 ` Greg KH
2018-01-07 19:37 ` Dan Williams
2018-01-09 8:40 ` Laurent Pinchart
2018-01-09 10:04 ` Greg KH
2018-01-09 14:26 ` Laurent Pinchart
2018-01-09 14:47 ` Greg KH
2018-01-08 11:23 ` Laurent Pinchart
2018-01-09 2:11 ` Dan Williams
2018-01-06 1:10 ` [PATCH 08/18] carl9170: " Dan Williams
2018-01-06 10:01 ` Sergei Shtylyov
2018-01-06 14:23 ` Christian Lamparter
2018-01-06 15:06 ` Alan Cox
2018-01-06 16:38 ` Christian Lamparter
2018-01-06 16:34 ` Dan Williams
2018-01-06 1:10 ` [PATCH 09/18] p54: " Dan Williams
2018-01-06 10:01 ` Sergei Shtylyov
2018-01-06 1:10 ` [PATCH 10/18] qla2xxx: " Dan Williams
2018-01-06 9:03 ` Greg KH
2018-01-06 9:42 ` Greg KH
2018-01-11 22:15 ` Dan Williams
2018-01-12 7:27 ` Greg KH
2018-01-12 15:25 ` James Bottomley
2018-01-06 1:10 ` [PATCH 11/18] cw1200: " Dan Williams
2018-01-06 1:10 ` [PATCH 12/18] Thermal/int340x: " Dan Williams
2018-01-06 1:53 ` Srinivas Pandruvada
2018-01-06 1:57 ` Dan Williams
2018-01-06 17:24 ` Srinivas Pandruvada
2018-01-06 10:03 ` Sergei Shtylyov [this message]
2018-01-06 1:11 ` [PATCH 13/18] ipv6: " Dan Williams
2018-01-06 10:04 ` Sergei Shtylyov
2018-01-06 14:48 ` Stephen Hemminger
2018-01-06 18:05 ` Dan Williams
2018-01-06 1:11 ` [PATCH 14/18] ipv4: " Dan Williams
2018-01-06 9:00 ` Greg KH
2018-01-06 9:01 ` Greg KH
2018-01-06 12:23 ` Alan Cox
2018-01-06 15:14 ` Greg KH
2018-01-06 16:29 ` Dan Williams
2018-01-06 18:10 ` Dan Williams
2018-01-06 10:04 ` Sergei Shtylyov
2018-01-06 1:11 ` [PATCH 15/18] vfs, fdtable: " Dan Williams
2018-01-06 10:05 ` Sergei Shtylyov
2018-01-06 1:11 ` [PATCH 16/18] net: mpls: " Dan Williams
2018-01-06 10:06 ` Sergei Shtylyov
2018-01-09 3:11 ` Eric W. Biederman
2018-01-09 3:42 ` Dan Williams
2018-01-09 4:13 ` Linus Torvalds
2018-01-09 4:21 ` Linus Torvalds
2018-01-10 0:48 ` Dan Williams
2018-01-10 1:33 ` Dan Williams
2018-01-10 1:57 ` Alexei Starovoitov
2018-01-10 2:22 ` Dan Williams
2018-01-10 3:07 ` Alexei Starovoitov
2018-01-10 3:27 ` Linus Torvalds
2018-01-09 16:17 ` Eric W. Biederman
2018-01-09 18:01 ` Dan Williams
2018-01-10 0:54 ` Eric W. Biederman
2018-01-10 1:31 ` Dan Williams
2018-01-06 1:11 ` [PATCH 17/18] udf: " Dan Williams
2018-01-08 10:20 ` Jan Kara
2018-01-06 1:11 ` [PATCH 18/18] userns: " Dan Williams
2018-01-06 2:22 ` [PATCH 00/18] " Eric W. Biederman
2018-01-06 6:30 ` Dan Williams
2018-01-08 10:08 ` Peter Zijlstra
2018-01-08 11:14 ` Laurent Pinchart
2018-01-08 11:43 ` Alan Cox
2018-01-08 11:55 ` Peter Zijlstra
2018-01-08 18:33 ` Ingo Molnar
2018-01-08 16:20 ` Bart Van Assche
2018-01-06 18:56 ` Florian Fainelli
2018-01-06 18:59 ` Arjan van de Ven
2018-01-06 19:37 ` Dan Williams
2018-01-06 20:07 ` Dan Williams
2018-01-08 4:49 ` Bart Van Assche
2018-01-08 13:33 ` Arjan van de Ven
2018-01-09 19:34 ` Jiri Kosina
2018-01-09 19:44 ` Dan Williams
2018-01-09 20:55 ` Josh Poimboeuf
2018-01-11 9:54 ` Jiri Kosina
2018-01-11 15:58 ` Dan Williams
2018-01-11 16:34 ` Daniel Borkmann
2018-01-13 11:33 ` QingFeng Hao
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=b1d114af-c0ba-63f5-0905-86128d3c0b3a@cogentembedded.com \
--to=sergei.shtylyov@cogentembedded.com \
--cc=alan@linux.intel.com \
--cc=dan.j.williams@intel.com \
--cc=edubezval@gmail.com \
--cc=elena.reshetova@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=rui.zhang@intel.com \
--cc=srinivas.pandruvada@linux.intel.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/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).