Print this page
OS-7125 Need mitigation of L1TF (CVE-2018-3646)
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>

@@ -34,11 +34,11 @@
 
 /*       Copyright (c) 1987, 1988 Microsoft Corporation                 */
 /*         All Rights Reserved                                          */
 
 /*
- * Copyright 2016 Joyent, Inc.
+ * Copyright (c) 2018 Joyent, Inc.
  */
 
 #include <sys/errno.h>
 #include <sys/asm_linkage.h>
 

@@ -864,12 +864,12 @@
         cmpq    $BCOPY_NHM_REP, %rdx
         .globl bcopy_patch_end
 bcopy_patch_end:
 
         .p2align 4
-        .globl bcopy_ck_size
-bcopy_ck_size:
+        ALTENTRY(bcopy_ck_size)
+
         cmpq    $BCOPY_DFLT_REP, %rdx
         jae     L(use_rep)
 
         /*
          * Align to a 8-byte boundary. Avoids penalties from unaligned stores

@@ -954,10 +954,11 @@
         xchgq   %rsi, %rdi              /* %rdi = src, %rsi = destination */
         andq    $7, %rdx                /* remainder */
         jnz     L(do_remainder)
         ret
 #undef  L
+        SET_SIZE(bcopy_ck_size)
 
 #ifdef DEBUG
         /*
          * Setup frame on the run-time stack. The end of the input argument
          * area must be aligned on a 16 byte boundary. The stack pointer %rsp,