patches/kernel/0037-objtool-Upgrade-libelf-devel-warning-to-error-for-CO.patch

   1 From 2c9eb7028c0714c3379b58a59c60f7b5b7a5adb0 Mon Sep 17 00:00:00 2001
   2 From: Josh Poimboeuf <jpoimboe@redhat.com>
   3 Date: Tue, 3 Oct 2017 20:10:36 -0500
   4 Subject: [PATCH 037/242] objtool: Upgrade libelf-devel warning to error for
   5  CONFIG_ORC_UNWINDER
   6 MIME-Version: 1.0
   7 Content-Type: text/plain; charset=UTF-8
   8 Content-Transfer-Encoding: 8bit
   9
  10 CVE-2017-5754
  11
  12 With CONFIG_ORC_UNWINDER, if the user doesn't have libelf-devel
  13 installed, and they don't see the make warning, their ORC unwinder will
  14 be silently broken.  Upgrade the warning to an error.
  15
  16 Reported-and-tested-by: Borislav Petkov <bp@alien8.de>
  17 Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
  18 Cc: Linus Torvalds <torvalds@linux-foundation.org>
  19 Cc: Peter Zijlstra <peterz@infradead.org>
  20 Cc: Thomas Gleixner <tglx@linutronix.de>
  21 Link: http://lkml.kernel.org/r/d9dfc39fb8240998820f9efb233d283a1ee96084.1507079417.git.jpoimboe@redhat.com
  22 Signed-off-by: Ingo Molnar <mingo@kernel.org>
  23 (cherry picked from commit 3dd40cb320fee7c23b574ab821ce140ccd1281c9)
  24 Signed-off-by: Andy Whitcroft <apw@canonical.com>
  25 Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
  26 (cherry picked from commit c413466a72ca533ec126ebc0c5bb579ae0c96b1d)
  27 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  28 ---
  29  Makefile | 6 +++++-
  30  1 file changed, 5 insertions(+), 1 deletion(-)
  31
  32 diff --git a/Makefile b/Makefile
  33 index 8e14a926fc94..490ce18685ea 100644
  34 --- a/Makefile
  35 +++ b/Makefile
  36 @@ -965,7 +965,11 @@ ifdef CONFIG_STACK_VALIDATION
  37    ifeq ($(has_libelf),1)
  38      objtool_target := tools/objtool FORCE
  39    else
  40 -    $(warning "Cannot use CONFIG_STACK_VALIDATION, please install libelf-dev, libelf-devel or elfutils-libelf-devel")
  41 +    ifdef CONFIG_ORC_UNWINDER
  42 +      $(error "Cannot generate ORC metadata for CONFIG_ORC_UNWINDER=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")
  43 +    else
  44 +      $(warning "Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")
  45 +    endif
  46      SKIP_STACK_VALIDATION := 1
  47      export SKIP_STACK_VALIDATION
  48    endif
  49 --
  50 2.14.2
  51