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

          --- old/usr/src/uts/intel/zfs/Makefile
          +++ new/usr/src/uts/intel/zfs/Makefile

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  #

  22   22  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  23   23  # Use is subject to license terms.
  24   24  #
  25   25  #       This makefile drives the production of the zfs file system
  26   26  #       kernel module.
  27   27  #
  28   28  # Copyright 2013 Saso Kiselkov. All rights reserved.
  29   29  #
  30   30  # Copyright (c) 2016 by Delphix. All rights reserved.
  31   31  #
  32      -# Copyright (c) 2018, Joyent, Inc.
       32 +# Copyright 2018 Joyent, Inc.
  33   33  
  34   34  #
  35   35  #       Path to the base of the uts directory tree (usually /usr/src/uts).
  36   36  #
  37   37  UTSBASE = ../..
  38   38  
  39   39  ARCHDIR:sh = cd ..; basename `pwd`
  40   40  
  41   41  #
  42   42  #       Define the module and object file sets.

  43   43  #
  44   44  MODULE          = zfs
  45   45  OBJECTS         = $(ZFS_OBJS:%=$(OBJS_DIR)/%) $(LUA_OBJS:%=$(OBJS_DIR)/%)
  46   46  # LUA_OBJS are intentionally omitted from LINTS
  47   47  LINTS           = $(ZFS_OBJS:%.o=$(LINTS_DIR)/%.ln)
  48   48  ROOTMODULE      = $(ROOT_DRV_DIR)/$(MODULE)
  49   49  ROOTLINK        = $(ROOT_FS_DIR)/$(MODULE)
  50   50  CONF_SRCDIR     = $(UTSBASE)/common/fs/zfs
  51   51  
  52   52  #
  53   53  #       Include common rules.
  54   54  #
  55   55  include ../Makefile.$(ARCHDIR)
  56   56  
  57   57  #
  58   58  #       Define targets
  59   59  #
  60   60  ALL_TARGET      = $(BINARY) $(SRC_CONFILE)
  61   61  LINT_TARGET     = $(MODULE).lint
  62   62  INSTALL_TARGET  = $(BINARY) $(ROOTMODULE) $(ROOTLINK) $(ROOT_CONFFILE)
  63   63  
  64   64  #
  65   65  #       Overrides and depends_on

  66   66  #
  67   67  MODSTUBS_DIR     = $(OBJS_DIR)
  68   68  LDFLAGS         += -dy -Nfs/specfs -Ncrypto/swrand -Nmisc/idmap -Nmisc/sha2 \
  69   69          -Nmisc/skein -Nmisc/edonr
  70   70  
  71   71  INC_PATH        += -I$(UTSBASE)/common/fs/zfs
  72   72  INC_PATH        += -I$(UTSBASE)/common/fs/zfs/lua
  73   73  INC_PATH        += -I$(SRC)/common
  74   74  INC_PATH        += -I$(COMMONBASE)/zfs
  75   75  
       76 +CPPFLAGS        += -I$(UTSBASE)/i86pc
  76   77  C99LMODE=       -Xc99=%all
  77   78  
  78   79  #
  79   80  # For now, disable these lint checks; maintainers should endeavor
  80   81  # to investigate and remove these for maximum lint coverage.
  81   82  # Please do not carry these forward to new Makefiles.
  82   83  #
  83   84  LINTTAGS        += -erroff=E_SUSPICIOUS_COMPARISON
  84   85  LINTTAGS        += -erroff=E_BAD_PTR_CAST_ALIGN
  85   86  LINTTAGS        += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED

  86   87  LINTTAGS        += -erroff=E_STATIC_UNUSED
  87   88  LINTTAGS        += -erroff=E_PTRDIFF_OVERFLOW
  88   89  LINTTAGS        += -erroff=E_ASSIGN_NARROW_CONV
  89   90  
  90   91  CERRWARN        += -_gcc=-Wno-type-limits
  91   92  CERRWARN        += -_gcc=-Wno-switch
  92   93  CERRWARN        += -_gcc=-Wno-parentheses
  93   94  CERRWARN        += -_gcc=-Wno-unused-variable
  94   95  CERRWARN        += -_gcc=-Wno-unused-function
  95   96  CERRWARN        += -_gcc=-Wno-unused-label
  96   97  
  97   98  # needs work
  98   99  SMOFF += all_func_returns,indenting
  99  100  $(OBJS_DIR)/llex.o := SMOFF += index_overflow
 100  101  $(OBJS_DIR)/metaslab.o := SMOFF += no_if_block
 101  102  $(OBJS_DIR)/zfs_vnops.o := SMOFF += signed
 102  103  # needs work
 103  104  $(OBJS_DIR)/zvol.o := SMOFF += deref_check,signed
 104  105  
 105  106  # false positives
 106  107  $(OBJS_DIR)/zfs_ctldir.o := SMOFF += strcpy_overflow
 107  108  $(OBJS_DIR)/zfs_ioctl.o := SMOFF += strcpy_overflow
 108  109  
 109  110  #
 110  111  #       Default build targets.
 111  112  #
 112  113  .KEEP_STATE:
 113  114  
 114  115  def:            $(DEF_DEPS)
 115  116  
 116  117  all:            $(ALL_DEPS)
 117  118  
 118  119  clean:          $(CLEAN_DEPS)
 119  120  
 120  121  clobber:        $(CLOBBER_DEPS)
 121  122  
 122  123  lint:           $(LINT_DEPS)
 123  124  
 124  125  modlintlib:     $(MODLINTLIB_DEPS)
 125  126  
 126  127  clean.lint:     $(CLEAN_LINT_DEPS)
 127  128  
 128  129  install:        $(INSTALL_DEPS)
 129  130  
 130  131  $(ROOTLINK):    $(ROOT_FS_DIR) $(ROOTMODULE)
 131  132          -$(RM) $@; ln $(ROOTMODULE) $@
 132  133  
 133  134  #
 134  135  #       Include common targets.
 135  136  #
 136  137  include ../Makefile.targ

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX