linux-kernel - linux-next: manual merge of the ftrace tree with the tip tree

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>] [day] [month] [year] [list]

Message-ID: <20250311160834.5ae8c9b9@canb.auug.org.au>
Date: Tue, 11 Mar 2025 16:08:34 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Steven Rostedt <rostedt@...dmis.org>, Masami Hiramatsu
 <mhiramat@...nel.org>, Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar
 <mingo@...hat.com>, "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra
 <peterz@...radead.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, "Mike Rapoport (Microsoft)"
 <rppt@...nel.org>
Subject: linux-next: manual merge of the ftrace tree with the tip tree

Hi all,

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

  include/linux/module.h

between commits:

  c287c0723329 ("module: switch to execmem API for remapping as RW and restoring ROX")
  602df3712979 ("module: drop unused module_writable_address()")

from the tip tree and commit:

  186a3d01d596 ("module: Add module_for_each_mod() function")

from the ftrace 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 include/linux/module.h
index d9a5183a9fe7,9a71dd2cb11f..000000000000
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@@ -771,6 -772,18 +771,8 @@@ static inline bool is_livepatch_module(

  void set_module_sig_enforced(void);

 -void *__module_writable_address(struct module *mod, void *loc);
 -
 -static inline void *module_writable_address(struct module *mod, void *loc)
 -{
 -	if (!IS_ENABLED(CONFIG_ARCH_HAS_EXECMEM_ROX) || !mod ||
 -	    mod->state != MODULE_STATE_UNFORMED)
 -		return loc;
 -	return __module_writable_address(mod, loc);
 -}
 -
+ void module_for_each_mod(int(*func)(struct module *mod, void *data), void *data);
+ 
  #else /* !CONFIG_MODULES... */

  static inline struct module *__module_address(unsigned long addr)
@@@ -878,6 -891,15 +880,10 @@@ static inline bool module_is_coming(str
  {
  	return false;
  }
+ 
 -static inline void *module_writable_address(struct module *mod, void *loc)
 -{
 -	return loc;
 -}
 -
+ static inline void module_for_each_mod(int(*func)(struct module *mod, void *data), void *data)
+ {
+ }
  #endif /* CONFIG_MODULES */

  #ifdef CONFIG_SYSFS

Content of type "application/pgp-signature" skipped