Skip to content

Commit

Permalink
xen: avoid UB in guest handle field accessors
Browse files Browse the repository at this point in the history
Much like noted in 43d5c5d ("xen: avoid UB in guest handle
arithmetic"), address calculations involved in accessing a struct field
can overflow, too. Cast respective pointers to "unsigned long" and
convert type checking accordingly. Remaining arithmetic is, despite
there possibly being mathematical overflow, okay as per the C99 spec:
"A computation involving unsigned operands can never overflow, because a
result that cannot be represented by the resulting unsigned integer type
is reduced modulo the number that is one greater than the largest value
that can be represented by the resulting type." The overflow that we
need to guard against is checked for in array_access_ok().

While there add the missing (see {,__}copy_to_guest_offset()) is-not-
const checks to {,__}copy_field_to_guest().

Typically, but not always, no change to generated code; code generation
(register allocation) is different for at least common/grant_table.c.

Signed-off-by: Jan Beulich <[email protected]>
Acked-by: Andrew Cooper <[email protected]>
Release-Acked-by: Oleksii Kurochko <[email protected]>
  • Loading branch information
jbeulich committed Jul 2, 2024
1 parent d2fe9ab commit 08daa72
Showing 1 changed file with 24 additions and 10 deletions.
34 changes: 24 additions & 10 deletions xen/include/xen/guest_access.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,16 +95,23 @@
/* Copy sub-field of a structure to guest context via a guest handle. */
#define copy_field_to_guest(hnd, ptr, field) ({ \
const typeof(&(ptr)->field) _s = &(ptr)->field; \
void *_d = &(hnd).p->field; \
(void)(&(hnd).p->field == _s); \
raw_copy_to_guest(_d, _s, sizeof(*_s)); \
unsigned long d_ = (unsigned long)(hnd).p; \
/* Check that the handle is not for a const type */ \
void *__maybe_unused _t = (hnd).p; \
(void)((typeof_field(typeof(*(hnd).p), field) *)NULL == _s); \
raw_copy_to_guest((void *)(d_ + offsetof(typeof(*(hnd).p), field)), \
_s, sizeof(*_s)); \
})

/* Copy sub-field of a structure from guest context via a guest handle. */
#define copy_field_from_guest(ptr, hnd, field) ({ \
const typeof(&(ptr)->field) _s = &(hnd).p->field; \
unsigned long s_ = (unsigned long)(hnd).p; \
typeof(&(ptr)->field) _d = &(ptr)->field; \
raw_copy_from_guest(_d, _s, sizeof(*_d)); \
(void)((typeof_field(typeof(*(hnd).p), field) *)NULL == _d); \
raw_copy_from_guest(_d, \
(const void *)(s_ + \
offsetof(typeof(*(hnd).p), field)), \
sizeof(*_d)); \
})

#define copy_to_guest(hnd, ptr, nr) \
Expand Down Expand Up @@ -149,15 +156,22 @@

#define __copy_field_to_guest(hnd, ptr, field) ({ \
const typeof(&(ptr)->field) _s = &(ptr)->field; \
void *_d = &(hnd).p->field; \
(void)(&(hnd).p->field == _s); \
__raw_copy_to_guest(_d, _s, sizeof(*_s)); \
unsigned long d_ = (unsigned long)(hnd).p; \
/* Check that the handle is not for a const type */ \
void *__maybe_unused _t = (hnd).p; \
(void)((typeof_field(typeof(*(hnd).p), field) *)NULL == _s); \
__raw_copy_to_guest((void *)(d_ + offsetof(typeof(*(hnd).p), field)), \
_s, sizeof(*_s)); \
})

#define __copy_field_from_guest(ptr, hnd, field) ({ \
const typeof(&(ptr)->field) _s = &(hnd).p->field; \
unsigned long s_ = (unsigned long)(hnd).p; \
typeof(&(ptr)->field) _d = &(ptr)->field; \
__raw_copy_from_guest(_d, _s, sizeof(*_d)); \
(void)((typeof_field(typeof(*(hnd).p), field) *)NULL == _d); \
__raw_copy_from_guest(_d, \
(const void *)(s_ + \
offsetof(typeof(*(hnd).p), field)), \
sizeof(*_d)); \
})

#define __copy_to_guest(hnd, ptr, nr) \
Expand Down

0 comments on commit 08daa72

Please sign in to comment.