diff --git a/chapters/03_background/03_01_wasm.tex b/chapters/03_background/03_01_wasm.tex index e75afea..b8e8b61 100644 --- a/chapters/03_background/03_01_wasm.tex +++ b/chapters/03_background/03_01_wasm.tex @@ -15,11 +15,11 @@ Besides instructions or execution behavior, two file formats are defined by the Both formats represent the same underlying content, but serve different purposes. % \begin{codeblock}[label=lst:wasmexample]{\Gls{wasm} Binary Format}{.wasm} -% \inputminted{hex}{\subfix{listings/wat_example.hex}} +% \inputminted{hex}{listings/wat_example.hex} % \end{codeblock} \begin{codeblock}[label=lst:watexample]{\Gls{wasm} Text Format}{.wat} - \inputminted{wat}{\subfix{listings/wat_example.wat}} + \inputminted{wat}{listings/wat_example.wat} \end{codeblock} % TODO: Info on wat (module, type, func, memory, global, export) diff --git a/chapters/03_background/03_03_fault_chain.tex b/chapters/03_background/03_03_fault_chain.tex new file mode 100644 index 0000000..f116ec0 --- /dev/null +++ b/chapters/03_background/03_03_fault_chain.tex @@ -0,0 +1,9 @@ +%! TeX program = lualatex +%! TeX root = ../../thesis.tex +\documentclass[../../thesis.tex]{subfiles} + +\begin{document} + +\section{Faults, Errors and Failures}\label{sec:faultchain} + +\end{document} diff --git a/chapters/03_background/03_03_fail.tex b/chapters/03_background/03_04_fail.tex similarity index 97% rename from chapters/03_background/03_03_fail.tex rename to chapters/03_background/03_04_fail.tex index d7bb6f4..410a80a 100644 --- a/chapters/03_background/03_03_fail.tex +++ b/chapters/03_background/03_04_fail.tex @@ -18,7 +18,7 @@ This abstraction layer allows switching out backends to support different target To perform a vulnerability analysis, the examined program needs to be instrumented with fences that define the region to trace (see \autoref{lst:tracefencemarkers}). \begin{codeblock}[label=lst:tracefencemarkers]{Trace Region Fence}{.cpp} - \inputminted{cpp}{\subfix{listings/tracefence.cpp}} + \inputminted{cpp}{listings/tracefence.cpp} \end{codeblock} \Gls{fail} then records the instruction pointer changes and memory accesses inside this region during the so-called \gls{goldenrun}: a faultless execution of the program that determines which injections should be performed during the campaign. Then, the \gls{goldenrun} is enriched with the traced region's disassembly to take into account the register reads and writes. @@ -50,7 +50,7 @@ Furthermore, different experiment outcomes are classified: Ok/Detected/Fail outcomes are classified by instrumenting the tested code with \textquote{markers} (see \autoref{lst:classificationmarkers}). If the program execution passes a marker, the experiment outcome is classified accordingly. \begin{codeblock}[label=lst:classificationmarkers]{Classification Markers}{.cpp} - \inputminted{cpp}{\subfix{listings/classificationmarkers.cpp}} + \inputminted{cpp}{listings/classificationmarkers.cpp} \end{codeblock} \end{document} diff --git a/chapters/0A_results/0A_00_results.tex b/chapters/0A_results/0A_00_results.tex new file mode 100644 index 0000000..01a4817 --- /dev/null +++ b/chapters/0A_results/0A_00_results.tex @@ -0,0 +1,10 @@ +%! TeX program = lualatex +%! TeX root = ../../thesis.tex +\documentclass[../../thesis.tex]{subfiles} + +\begin{document} + +% \addchap{Examples}\label{ch:examples} +\chapter{Experiment Results}\label{ch:experimentresults} + +\end{document} diff --git a/chapters/examples/examples.tex b/chapters/0B_sanity/0B_00_sanity_checks.tex similarity index 85% rename from chapters/examples/examples.tex rename to chapters/0B_sanity/0B_00_sanity_checks.tex index d9e1990..37e469e 100644 --- a/chapters/examples/examples.tex +++ b/chapters/0B_sanity/0B_00_sanity_checks.tex @@ -5,9 +5,7 @@ \begin{document} % \addchap{Examples}\label{ch:examples} -\chapter{Examples}\label{ch:examples} - -\todo[inline]{Sanity check so everything looks correct} +\chapter{Sanity Checks}\label{ch:examples} This is \code{inline code}. This is a reference to \Gls{fail}. @@ -21,18 +19,18 @@ This is a formula: \( \sum\limits_{f=1}^{\infty}\frac{o}{r}\cdot m_{u} + l^{a} \ This is \textbf{bold text that is slightly bold}, so underwhelming. In contrast, \sansbf{this text is very strong}, very cool\footnote{very cool}. -\begin{codeblock}[label=lst:examplelisting]{This is a listing.}{C++} - \inputminted{cpp}{\subfix{listings/example.cpp}} -\end{codeblock} - \begin{figure}[H] \centering - \begin{subfigure}[b]{\textwidth} - \includesvg[width=1.0\linewidth]{\subfix{figures/example.svg}} + \begin{subfigure}[b]{0.85\textwidth} + \includesvg[width=1.0\linewidth]{figures/example.svg} \end{subfigure} \caption{This is a figure.}\label{fig:examplefigure} \end{figure} +\begin{codeblock}[label=lst:examplelisting]{This is a listing.}{C++} + \inputminted{cpp}{listings/example.cpp} +\end{codeblock} + \begin{table}[H] \centering \begin{tabularx}{\textwidth}{lX} diff --git a/chapters/examples/figures/example.svg b/chapters/0B_sanity/figures/example.svg similarity index 100% rename from chapters/examples/figures/example.svg rename to chapters/0B_sanity/figures/example.svg diff --git a/chapters/examples/figures/heatmap2.svg b/chapters/0B_sanity/figures/heatmap2.svg similarity index 100% rename from chapters/examples/figures/heatmap2.svg rename to chapters/0B_sanity/figures/heatmap2.svg diff --git a/chapters/examples/listings/example.cpp b/chapters/0B_sanity/listings/example.cpp similarity index 100% rename from chapters/examples/listings/example.cpp rename to chapters/0B_sanity/listings/example.cpp diff --git a/thesis.tex b/thesis.tex index 6c623e8..d9ea645 100644 --- a/thesis.tex +++ b/thesis.tex @@ -17,9 +17,8 @@ \subfile{chapters/03_background/03_00_background.tex} \subfile{chapters/03_background/03_01_wasm.tex} \subfile{chapters/03_background/03_02_wamr.tex} -% TODO: Write about faults/errors/fault chain? -% TODO: Write about fault-injection? -\subfile{chapters/03_background/03_03_fail.tex} +\subfile{chapters/03_background/03_03_fault_chain.tex} +\subfile{chapters/03_background/03_04_fail.tex} \cleardoublepage% \subfile{chapters/04_methodology/04_00_methodology.tex} @@ -40,7 +39,10 @@ \appendix % \pagenumbering{Roman} -\subfile{chapters/examples/examples.tex} +\subfile{chapters/0A_results/0A_00_results.tex} +\cleardoublepage% + +\subfile{chapters/0B_sanity/0B_00_sanity_checks.tex} \cleardoublepage% \end{document}