lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20170220122227.54f04c2a@canb.auug.org.au>
Date:   Mon, 20 Feb 2017 12:22:27 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        Daniel Borkmann <daniel@...earbox.net>,
        Masami Hiramatsu <mhiramat@...nel.org>
Subject: linux-next: manual merge of the tip tree with the net-next tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  kernel/extable.c

between commit:

  74451e66d516 ("bpf: make jited programs visible in traces")

from the net-next tree and commit:

  5b485629ba0d ("kprobes, extable: Identify kprobes trampolines as kernel text area")

from the tip tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc kernel/extable.c
index bd82117ad424,e1359474baa5..000000000000
--- a/kernel/extable.c
+++ b/kernel/extable.c
@@@ -20,7 -20,7 +20,8 @@@
  #include <linux/module.h>
  #include <linux/mutex.h>
  #include <linux/init.h>
 +#include <linux/filter.h>
+ #include <linux/kprobes.h>
  
  #include <asm/sections.h>
  #include <linux/uaccess.h>
@@@ -105,8 -105,8 +106,10 @@@ int __kernel_text_address(unsigned lon
  		return 1;
  	if (is_ftrace_trampoline(addr))
  		return 1;
 +	if (is_bpf_text_address(addr))
 +		return 1;
+ 	if (is_kprobe_optinsn_slot(addr) || is_kprobe_insn_slot(addr))
+ 		return 1;
  	/*
  	 * There might be init symbols in saved stacktraces.
  	 * Give those symbols a chance to be printed in
@@@ -128,8 -128,8 +131,10 @@@ int kernel_text_address(unsigned long a
  		return 1;
  	if (is_ftrace_trampoline(addr))
  		return 1;
 +	if (is_bpf_text_address(addr))
 +		return 1;
+ 	if (is_kprobe_optinsn_slot(addr) || is_kprobe_insn_slot(addr))
+ 		return 1;
  	return 0;
  }
  

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ