Re: [UNIKRAFT PATCH v6 3/3] lib/ukboot: Initialize the canary value at boot

[Alice Suiu <alicesuiu17@xxxxxxxxx>]

Reviewed-by: Alice Suiu <alicesuiu17@xxxxxxxxx>

În lun., 3 aug. 2020 la 17:06, Vlad-Andrei Badoiu <vlad_andrei.badoiu@xxxxxx> a scris:

From: Vlad-Andrei BĂDOIU (78692) <vlad_andrei.badoiu@xxxxxxxxxxxxxxx>

We initialize the canary value right after all the internal libraries
have loaded.

Signed-off-by: Vlad-Andrei Badoiu <vlad_andrei.badoiu@xxxxxxxxxxxxxxx>
Signed-off-by: Vlad-Andrei Badoiu <vlad_andrei.badoiu@xxxxxx>
---
 lib/ukboot/boot.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lib/ukboot/boot.c b/lib/ukboot/boot.c
index 4e749aa5..3e92812d 100644
--- a/lib/ukboot/boot.c
+++ b/lib/ukboot/boot.c
@@ -63,6 +63,9 @@
 #ifdef CONFIG_LIBUKLIBPARAM
 #include <uk/libparam.h>
 #endif /* CONFIG_LIBUKLIBPARAM */
+#if CONFIG_LIBUKSP
+#include <uk/sp.h>
+#endif

 int main(int argc, char *argv[]) __weak;

@@ -187,6 +190,14 @@ void ukplat_entry(int argc, char *argv[])
        struct uk_sched *s = NULL;
        struct uk_thread *main_thread = NULL;
 #endif
+
+       /* We use a macro because if we were to use a function we
+        * would not be able to return from the function if we have
+        * changed the stack protector inside the function */
+#if CONFIG_LIBUKSP
+       UKSP_INIT_CANARY();
+#endif
+
        uk_ctor_func_t *ctorfn;

        uk_pr_info("Unikraft constructor table at %p - %p\n",
--
2.25.1