[PATCH 10/14] KVM: arm64: __ubsan_handle_load_invalid_value hyp/nVHE implementation.

[George-Aurelian Popescu]

From: George Popescu <georgep...@google.com>

The handler for the load invalid value undefined behaviour is
implemented for hyp/nVHE. The handler's parameters are stored inside
the buffer.

They are used by the symmetric handler from the kernel.

Signed-off-by: George Popescu <georgep...@google.com>
---
 arch/arm64/include/asm/kvm_ubsan.h |  5 ++++-
 arch/arm64/kvm/hyp/nvhe/ubsan.c    | 14 +++++++++++++-
 arch/arm64/kvm/kvm_ubsan_buffer.c  |  4 ++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/include/asm/kvm_ubsan.h 
b/arch/arm64/include/asm/kvm_ubsan.h
index 3130a80cd8b2..b643ac9a4090 100644
--- a/arch/arm64/include/asm/kvm_ubsan.h
+++ b/arch/arm64/include/asm/kvm_ubsan.h
@@ -22,12 +22,14 @@ struct kvm_ubsan_info {
                UBSAN_NONE,
                UBSAN_OUT_OF_BOUNDS,
                UBSAN_UNREACHABLE_DATA,
-               UBSAN_SHIFT_OUT_OF_BOUNDS
+               UBSAN_SHIFT_OUT_OF_BOUNDS,
+               UBSAN_INVALID_DATA
        } type;
        union {
                struct out_of_bounds_data out_of_bounds_data;
                struct unreachable_data unreachable_data;
                struct shift_out_of_bounds_data shift_out_of_bounds_data;
+               struct invalid_value_data invalid_value_data;
        };
        union {
                struct ubsan_values u_val;
@@ -38,3 +40,4 @@ struct kvm_ubsan_info {
 void __ubsan_handle_out_of_bounds(void *_data, void *index);
 void __ubsan_handle_builtin_unreachable(void *_data);
 void __ubsan_handle_shift_out_of_bounds(void *_data, void *lhs, void *rhs);
+void __ubsan_handle_load_invalid_value(void *_data, void *val);
diff --git a/arch/arm64/kvm/hyp/nvhe/ubsan.c b/arch/arm64/kvm/hyp/nvhe/ubsan.c
index 40b82143e57f..1888a1f51724 100644
--- a/arch/arm64/kvm/hyp/nvhe/ubsan.c
+++ b/arch/arm64/kvm/hyp/nvhe/ubsan.c
@@ -82,4 +82,16 @@ void __ubsan_handle_builtin_unreachable(void *_data)
        }
 }
 
-void __ubsan_handle_load_invalid_value(void *_data, void *val) {}
+void __ubsan_handle_load_invalid_value(void *_data, void *val)
+{
+       struct kvm_ubsan_info *slot;
+       struct invalid_value_data *data = _data;
+
+       slot = kvm_ubsan_buffer_next_slot();
+       if (slot) {
+               slot->type = UBSAN_INVALID_DATA;
+               slot->invalid_value_data = *data;
+               slot->u_val.lval = val;
+       }
+
+}
diff --git a/arch/arm64/kvm/kvm_ubsan_buffer.c 
b/arch/arm64/kvm/kvm_ubsan_buffer.c
index b4a282bec91d..01bf2171af9e 100644
--- a/arch/arm64/kvm/kvm_ubsan_buffer.c
+++ b/arch/arm64/kvm/kvm_ubsan_buffer.c
@@ -32,6 +32,10 @@ void __kvm_check_ubsan_data(struct kvm_ubsan_info *slot)
                
__ubsan_handle_shift_out_of_bounds(&slot->shift_out_of_bounds_data,
                                slot->u_val.lval, slot->u_val.rval);
                break;
+       case UBSAN_INVALID_DATA:
+               __ubsan_handle_load_invalid_value(&slot->invalid_value_data,
+                               slot->u_val.lval);
+               break;
        }
 }
 
-- 
2.28.0.618.gf4bc123cb7-goog