Skip to contentSkip to conversation

xen/evtchn: fix wrong usage of array_index_nospec()

PATCH In review Juergen Gross 2 participants 3 messages Jul 29

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xen/evtchn: fix wrong usage of array_index_nospec()

The size passed to array_index_nospec() in evtchn_fifo_word_from_port() doesn't match the value it is meant to clamp.

Fix it by clamping the port to a safe interval and use that value to calculate the event_array[] index and the offset into the page addressed by the array element.

Fixes 443d3ab6daee ("evtchn: block speculative out-of-bound accesses")
---
 xen/common/event_fifo.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
xen/common/event_fifo.c +3 -4
index cae08a594e..eb8e26bba1 100644
@@ -71,11 +71,10 @@ static inline event_word_t *evtchn_fifo_word_from_port(const struct domain *d,
      */
     smp_rmb();
 
-    p = array_index_nospec(port / EVTCHN_FIFO_EVENT_WORDS_PER_PAGE,
-                           d->evtchn_fifo->num_evtchns);
-    w = port % EVTCHN_FIFO_EVENT_WORDS_PER_PAGE;
+    p = array_index_nospec(port, d->evtchn_fifo->num_evtchns);
+    w = p % EVTCHN_FIFO_EVENT_WORDS_PER_PAGE;
 
-    return d->evtchn_fifo->event_array[p] + w;
+    return d->evtchn_fifo->event_array[p / EVTCHN_FIFO_EVENT_WORDS_PER_PAGE] + w;
 }
 
 static void cf_check evtchn_fifo_init(struct domain *d, struct evtchn *evtchn)
Signature · 1 line
2.55.0
Reviewed-by on v1 1/1
#1 lore raw

xen/common/event_fifo.c static inline event_word_t *evtchn_fifo_word_from_port(const struct domain *d, · line 75

Quoted 11 lines · Juergen Gross
xen/common/event_fifo.c +2 -3
@@ -71,11 +71,10 @@ static inline event_word_t *evtchn_fifo_word_from_port(const struct domain *d,
      */
     smp_rmb();
 
-    p = array_index_nospec(port / EVTCHN_FIFO_EVENT_WORDS_PER_PAGE,
-                           d->evtchn_fifo->num_evtchns);
-    w = port % EVTCHN_FIFO_EVENT_WORDS_PER_PAGE;
+    p = array_index_nospec(port, d->evtchn_fifo->num_evtchns);
+    w = p % EVTCHN_FIFO_EVENT_WORDS_PER_PAGE;

I don't see why the calculation of w would also need to change - whichever way it is, w is bounded by EVTCHN_FIFO_EVENT_WORDS_PER_PAGE (and hence safe). Preferably with that undone (can do while committing):

Jan

Quoted 5 lines
xen/common/event_fifo.c +1 -1
-    return d->evtchn_fifo->event_array[p] + w;
+    return d->evtchn_fifo->event_array[p / EVTCHN_FIFO_EVENT_WORDS_PER_PAGE] + w;
 }
 
 static void cf_check evtchn_fifo_init(struct domain *d, struct evtchn *evtchn)
#2 lore raw
Quoted 7 lines · Jan Beulich
Quoted 6 lines · Juergen Gross
xen/common/event_fifo.c +0 -0
@@ -71,11 +71,10 @@ static inline event_word_t *evtchn_fifo_word_from_port(const struct domain *d,
       */
      smp_rmb();
 
Quoted 8 lines

xen/common/event_fifo.c static inline event_word_t *evtchn_fifo_word_from_port(const struct domain *d, · line 75

Quoted 5 lines
xen/common/event_fifo.c +2 -3
-    p = array_index_nospec(port / EVTCHN_FIFO_EVENT_WORDS_PER_PAGE,
-                           d->evtchn_fifo->num_evtchns);
-    w = port % EVTCHN_FIFO_EVENT_WORDS_PER_PAGE;
+    p = array_index_nospec(port, d->evtchn_fifo->num_evtchns);
+    w = p % EVTCHN_FIFO_EVENT_WORDS_PER_PAGE;

I don't see why the calculation of w would also need to change - whichever way it is, w is bounded by EVTCHN_FIFO_EVENT_WORDS_PER_PAGE (and hence safe).

I thought it would be cleaner to use p for the index AND the offset.

Quoted 1 line

Preferably with that undone (can do while committing):

If you prefer this, go ahead.

Quoted 1 line

Thanks,

Juergen