KVM: arm64: Harden clock for nvhe/pKVM
PATCH 1/1 KVM: arm64: Harden clock for nvhe/pKVM
Sashiko(locally) reports possiblity of division by zero and out-of-bounds bitwise shift in trace_clock_update().
Although the clock update is untrusted, we should at least have some basic checks to avoid the clock value getting out of sync if the host is buggy.
--- arch/arm64/kvm/hyp/nvhe/clock.c | 3 +++ 1 file changed, 3 insertions(+)
arch/arm64/kvm/hyp/nvhe/clock.c +3 -0
@@ -35,6 +35,9 @@ void trace_clock_update(u32 mult, u32 shift, u64 epoch_ns, u64 epoch_cyc)struct clock_data *clock = &trace_clock_data;u64 bank = clock->cur ^1 ; +if (!mult || shift >=64 ) +return ; + clock->data[bank].mult = mult; clock->data[bank].shift = shift; clock->data[bank].epoch_ns = epoch_ns;
Signature · 1 line
2.54.0.545.g6539524ca2-goog
Quoted 6 lines · Mostafa Saleh
Sashiko(locally) reports possiblity of division by zero and out-of-bounds bitwise shift in
trace_clock_update().Although the clock update is untrusted, we should at least have some basic checks to avoid the clock value getting out of sync if the host is buggy.
I am not sure about the gain here. The host can still write values that will make it out of sync anyway.
The timestamp is ultimately fed and read by the host.
Quoted 23 lines
Signed-off-by Mostafa Saleh <[email protected]>--- arch/arm64/kvm/hyp/nvhe/clock.c | 3 +++ 1 file changed, 3 insertions(+)arch/arm64/kvm/hyp/nvhe/clock.c +3
-0@@ -35,6 +35,9 @@ void trace_clock_update(u32 mult, u32 shift, u64 epoch_ns, u64 epoch_cyc)struct clock_data *clock = &trace_clock_data;u64 bank = clock->cur ^1 ; +if (!mult || shift >=64 ) +return ; + clock->data[bank].mult = mult; clock->data[bank].shift = shift; clock->data[bank].epoch_ns = epoch_ns;Signature · 1 line
2.54.0.545.g6539524ca2-goog
Quoted 5 lines · Vincent Donnefort
Quoted 3 lines · Mostafa Saleh
Sashiko(locally) reports possiblity of division by zero and out-of-bounds bitwise shift in
trace_clock_update().
Quoted 9 lines
Quoted 3 lines
Although the clock update is untrusted, we should at least have some basic checks to avoid the clock value getting out of sync if the host is buggy.
I am not sure about the gain here. The host can still write values that will make it out of sync anyway.
The timestamp is ultimately fed and read by the host.
This is not about having the clock in sync, but to avoid executing undefined behavior, such as division by zero or large shifts in cases if the host is buggy and not malicious.
That was reported by Sashiko
https://sashiko.dev/#/patchset/20260501111928.259252-1-smostafa%40google.com
Thanks,
Mostafa
Quoted 23 lines
Quoted 23 lines
Signed-off-by Mostafa Saleh <[email protected]>--- arch/arm64/kvm/hyp/nvhe/clock.c | 3 +++ 1 file changed, 3 insertions(+)arch/arm64/kvm/hyp/nvhe/clock.c +3
-1@@ -35,6 +35,9 @@ void trace_clock_update(u32 mult, u32 shift, u64 epoch_ns, u64 epoch_cyc)struct clock_data *clock = &trace_clock_data;u64 bank = clock->cur ^1 ; +if (!mult || shift >=64 ) +return ; + clock->data[bank].mult = mult; clock->data[bank].shift = shift; clock->data[bank].epoch_ns = epoch_ns; --2.54.0.545.g6539524ca2-goog
Vincent Donnefort
Reviewed-byQuoted 17 lines · Mostafa Saleh
Quoted 10 lines · Vincent Donnefort
Quoted 6 lines · Mostafa Saleh
Sashiko(locally) reports possiblity of division by zero and out-of-bounds bitwise shift in
trace_clock_update().Although the clock update is untrusted, we should at least have some basic checks to avoid the clock value getting out of sync if the host is buggy.
Quoted 5 lines
I am not sure about the gain here. The host can still write values that will make it out of sync anyway.
The timestamp is ultimately fed and read by the host.
Quoted 8 lines
This is not about having the clock in sync, but to avoid executing undefined behavior, such as division by zero or large shifts in cases if the host is buggy and not malicious.
That was reported by Sashiko
https://sashiko.dev/#/patchset/20260501111928.259252-1-smostafa%40google.comThanks,
Mostafa
I would then reword that to make it clear it just prevents the host triggering UB on the hypervisor. It doesn't really harden much, which is fine because that data isn't relevant for the hypervisor.
Other than that:
Quoted 24 lines
Quoted 24 lines
Quoted 24 lines
Signed-off-by Mostafa Saleh <[email protected]>--- arch/arm64/kvm/hyp/nvhe/clock.c | 3 +++ 1 file changed, 3 insertions(+)arch/arm64/kvm/hyp/nvhe/clock.c +3
-1@@ -35,6 +35,9 @@ void trace_clock_update(u32 mult, u32 shift, u64 epoch_ns, u64 epoch_cyc)struct clock_data *clock = &trace_clock_data;u64 bank = clock->cur ^1 ; +if (!mult || shift >=64 ) +return ; + clock->data[bank].mult = mult; clock->data[bank].shift = shift; clock->data[bank].epoch_ns = epoch_ns; --2.54.0.545.g6539524ca2-goog
Marc Zyngier
maintainerQuoted 25 lines · Vincent Donnefort
Quoted 23 lines · Mostafa Saleh
Quoted 10 lines · Vincent Donnefort
Quoted 6 lines · Mostafa Saleh
Sashiko(locally) reports possiblity of division by zero and out-of-bounds bitwise shift in
trace_clock_update().Although the clock update is untrusted, we should at least have some basic checks to avoid the clock value getting out of sync if the host is buggy.
Quoted 5 lines
I am not sure about the gain here. The host can still write values that will make it out of sync anyway.
The timestamp is ultimately fed and read by the host.
This is not about having the clock in sync, but to avoid executing undefined behavior, such as division by zero or large shifts in cases if the host is buggy and not malicious.
That was reported by Sashiko
https://sashiko.dev/#/patchset/20260501111928.259252-1-smostafa%40google.com
Quoted 6 lines
Quoted 2 lines
Thanks,
MostafaI would then reword that to make it clear it just prevents the host triggering UB on the hypervisor. It doesn't really harden much, which is fine because that data isn't relevant for the hypervisor.
I can repaint the commit message when applying this.
Quoted 4 lines
Other than that:
Reviewed-by Vincent Donnefort <[email protected]>
Thanks,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Quoted 8 lines · Mostafa Saleh
Sashiko(locally) reports possiblity of division by zero and out-of-bounds bitwise shift in
trace_clock_update().Although the clock update is untrusted, we should at least have some basic checks to avoid the clock value getting out of sync if the host is buggy.
[...]
Applied to fixes, thanks!
[1/1] KVM: arm64: Harden clock for nvhe/pKVM
commit: 9a624ea3f26f40c76bd2c7f77cde30659d42efbd
Cheers,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.