Skip to content

Commit bd0dbf9

Browse files
avagingvisor-bot
authored andcommitted
kvm/arm64: send SIGKILL if ring0.El0SyncInv has been triggered
Linux does the same thing. PiperOrigin-RevId: 722789748
1 parent 3754522 commit bd0dbf9

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

images/default/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ RUN curl https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud
3030
ln -s /google-cloud-sdk/bin/gcloud /usr/bin/gcloud
3131

3232
# Download the official bazel binary. The APT repository isn't used because there is not packages for arm64.
33-
RUN sh -c 'curl -o /usr/local/bin/bazel https://releases.bazel.build/7.3.2/release/bazel-7.3.2-linux-$(uname -m | sed s/aarch64/arm64/) && chmod ugo+x /usr/local/bin/bazel'
33+
RUN sh -c 'curl -o /usr/local/bin/bazel https://releases.bazel.build/7.5.0/release/bazel-7.5.0-linux-$(uname -m | sed s/aarch64/arm64/) && chmod ugo+x /usr/local/bin/bazel'
3434
WORKDIR /workspace
3535
ENTRYPOINT ["/usr/local/bin/bazel"]

pkg/sentry/platform/kvm/machine_arm64_unsafe.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,8 @@ func (c *vCPU) SwitchToUser(switchOpts ring0.SwitchOpts, info *linux.SignalInfo)
327327
return c.fault(int32(unix.SIGBUS), info)
328328
case ring0.Vector(bounce): // ring0.VirtualizationException.
329329
return hostarch.NoAccess, platform.ErrContextInterrupt
330-
case ring0.El0SyncUndef:
330+
case ring0.El0SyncUndef,
331+
ring0.El0SyncInv:
331332
return c.fault(int32(unix.SIGILL), info)
332333
case ring0.El0SyncDbg:
333334
*info = linux.SignalInfo{

0 commit comments

Comments
 (0)