Skip to content

Commit

Permalink
KVM: arm64: Enable UBSAN_BOUNDS for the both the kernel and hyp/nVHE
Browse files Browse the repository at this point in the history
If an out of bounds happens inside the hyp/nVHE code, the ubsan_out_of_bounds
handler stores the logging data inside the kvm_ubsan_buffer. The one responsible
for printing is the kernel ubsan_out_of_bounds handler. The process of
decapsulating the data from the buffer is straightforward.

Signed-off-by: George Popescu <georgepope@google.com>
Signed-off-by: Elena Petrova <lenaptr@google.com>
  • Loading branch information
George Popescu authored and intel-lab-lkp committed Jan 15, 2021
1 parent aba3219 commit c8a90dc
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 3 deletions.
19 changes: 18 additions & 1 deletion arch/arm64/include/asm/kvm_ubsan.h
Expand Up @@ -9,6 +9,23 @@
#define UBSAN_MAX_TYPE 6
#define KVM_UBSAN_BUFFER_SIZE 1000


struct ubsan_values {
void *lval;
void *rval;
char op;
};

struct kvm_ubsan_info {
int type;
enum {
UBSAN_OUT_OF_BOUNDS,
} type;
union {
struct out_of_bounds_data out_of_bounds_data;
};
union {
struct ubsan_values u_val;
};
};

void __ubsan_handle_out_of_bounds(void *_data, void *index);
14 changes: 12 additions & 2 deletions arch/arm64/kvm/hyp/nvhe/ubsan.c
Expand Up @@ -13,7 +13,6 @@
#include <asm/kvm_ubsan.h>
#include <asm/kvm_debug_buffer.h>
#include <kvm/arm_pmu.h>
#include <ubsan.h>

DEFINE_KVM_DEBUG_BUFFER(struct kvm_ubsan_info, kvm_ubsan_buffer,
kvm_ubsan_buff_wr_ind, KVM_UBSAN_BUFFER_SIZE);
Expand Down Expand Up @@ -44,7 +43,18 @@ void __ubsan_handle_type_mismatch(struct type_mismatch_data *data, void *ptr) {}

void __ubsan_handle_type_mismatch_v1(void *_data, void *ptr) {}

void __ubsan_handle_out_of_bounds(void *_data, void *index) {}
void __ubsan_handle_out_of_bounds(void *_data, void *index)
{
struct kvm_ubsan_info *slot;
struct out_of_bounds_data *data = _data;

slot = kvm_ubsan_buffer_next_slot();
if (slot) {
slot->type = UBSAN_OUT_OF_BOUNDS;
slot->out_of_bounds_data = *data;
slot->u_val.lval = index;
}
}

void __ubsan_handle_shift_out_of_bounds(void *_data, void *lhs, void *rhs) {}

Expand Down
10 changes: 10 additions & 0 deletions arch/arm64/kvm/kvm_ubsan_buffer.c
Expand Up @@ -17,6 +17,15 @@
DECLARE_KVM_DEBUG_BUFFER(struct kvm_ubsan_info, kvm_ubsan_buffer,
kvm_ubsan_buff_wr_ind, KVM_UBSAN_BUFFER_SIZE);

void __kvm_check_ubsan_data(struct kvm_ubsan_info *slot)
{
switch (slot->type) {
case UBSAN_OUT_OF_BOUNDS:
__ubsan_handle_out_of_bounds(&slot->out_of_bounds_data,
slot->u_val.lval);
break;
}
}

void iterate_kvm_ubsan_buffer(unsigned long left, unsigned long right)
{
Expand All @@ -26,6 +35,7 @@ void iterate_kvm_ubsan_buffer(unsigned long left, unsigned long right)
slot = (struct kvm_ubsan_info *) this_cpu_ptr_nvhe_sym(kvm_ubsan_buffer);
for (i = left; i < right; ++i) {
/* check ubsan data */
__kvm_check_ubsan_data(slot + i);
slot[i].type = 0;
}
}
Expand Down

0 comments on commit c8a90dc

Please sign in to comment.