Browse Source

[LibOS] Rename shim_tls_check_canary() to shim_tcb_check_canary()

Isaku Yamahata 6 years ago
parent
commit
3ec3c078fa
2 changed files with 3 additions and 3 deletions
  1. 1 1
      LibOS/shim/include/shim_tls.h
  2. 2 2
      LibOS/shim/src/shim_init.c

+ 1 - 1
LibOS/shim/include/shim_tls.h

@@ -64,7 +64,7 @@ static inline shim_tcb_t * shim_get_tcb(void)
     return (shim_tcb_t*)tcb->libos_tcb;
 }
 
-static inline bool shim_tls_check_canary(void)
+static inline bool shim_tcb_check_canary(void)
 {
     /* TODO: optimize to use single movq %gs:<offset> */
     shim_tcb_t * shim_tcb = shim_get_tcb();

+ 2 - 2
LibOS/shim/src/shim_init.c

@@ -222,7 +222,7 @@ void init_fs_base (unsigned long fs_base, struct shim_thread * thread)
     }
 
     DkSegmentRegister(PAL_SEGMENT_FS, (PAL_PTR)fs_base);
-    assert(shim_tls_check_canary());
+    assert(shim_tcb_check_canary());
 }
 
 void update_fs_base (unsigned long fs_base)
@@ -236,7 +236,7 @@ void update_fs_base (unsigned long fs_base)
     }
 
     DkSegmentRegister(PAL_SEGMENT_FS, (PAL_PTR)fs_base);
-    assert(shim_tls_check_canary());
+    assert(shim_tcb_check_canary());
 }
 
 DEFINE_PROFILE_OCCURENCE(alloc_stack, memory);