aboutsummaryrefslogtreecommitdiffstats
path: root/tools/docker
diff options
context:
space:
mode:
authorAlexander Potapenko <glider@google.com>2022-05-25 14:00:05 +0200
committerAlexander Potapenko <ramosian.glider@gmail.com>2022-05-25 15:17:05 +0200
commit3037caa999f22cdb40f1fa5c6b1b13e5d6af9781 (patch)
tree3f9bd1d1a57091beeaa9c9fdaaccd112bae14a60 /tools/docker
parent647c0e2737b12e092ce23948537ddf7dd3992c53 (diff)
tools/docker: update Clang for KMSAN
Switch to a custom Clang version built from LLVM trunk 9ffb5944a699 with a patch on top of it implementing the -msan-pass-caller-to-runtime flag. This flag is needed to detect noinstr->instr transitions in the kernel. Once it is tested on syzbot, it will be added to upstream Clang.
Diffstat (limited to 'tools/docker')
-rw-r--r--tools/docker/env/Dockerfile2
-rw-r--r--tools/docker/syzbot/Dockerfile2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/docker/env/Dockerfile b/tools/docker/env/Dockerfile
index fae6848c9..2ac5d12be 100644
--- a/tools/docker/env/Dockerfile
+++ b/tools/docker/env/Dockerfile
@@ -49,7 +49,7 @@ RUN sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/b
# Download and install the custom Clang required to build KMSAN.
# TODO(@ramosian-glider): switch to stable Clang once KMSAN is upstreamed.
-ENV CLANG_KMSAN_VER 38e16e1cebb8
+ENV CLANG_KMSAN_VER 9ffb5944a699
RUN curl https://storage.googleapis.com/syzkaller/clang-${CLANG_KMSAN_VER}.tar.gz | tar -C /usr/local/ -xz
RUN ln -s /usr/local/clang-${CLANG_KMSAN_VER} /usr/local/clang-kmsan
diff --git a/tools/docker/syzbot/Dockerfile b/tools/docker/syzbot/Dockerfile
index 2a5006a69..e0589884a 100644
--- a/tools/docker/syzbot/Dockerfile
+++ b/tools/docker/syzbot/Dockerfile
@@ -46,7 +46,7 @@ RUN sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/b
# Download and install the custom Clang required to build KMSAN.
# TODO(@ramosian-glider): switch to stable Clang once KMSAN is upstreamed.
-ENV CLANG_KMSAN_VER 38e16e1cebb8
+ENV CLANG_KMSAN_VER 9ffb5944a699
RUN curl https://storage.googleapis.com/syzkaller/clang-${CLANG_KMSAN_VER}.tar.gz | tar -C /usr/local/ -xz
RUN ln -s /usr/local/clang-${CLANG_KMSAN_VER} /usr/local/clang-kmsan