linux-kernel - Re: linux-next: manual merge of the sysctl tree with the modules 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>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <uxgymmpzccvm7d5aydj5ozs7qdnqrpg7ta77uu43bqq3epcwiw@w57gyleopugp>
Date: Mon, 4 Aug 2025 09:49:43 +0200
From: Joel Granados <joel.granados@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Luis Chamberlain <mcgrof@...nel.org>, Petr Pavlu <petr.pavlu@...e.com>, 
	Sami Tolvanen <samitolvanen@...gle.com>, Daniel Gomez <da.gomez@...sung.com>, Kees Cook <kees@...nel.org>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List <linux-next@...r.kernel.org>, 
	Thomas Weißschuh <thomas.weissschuh@...utronix.de>
Subject: Re: linux-next: manual merge of the sysctl tree with the modules tree

On Thu, Jul 31, 2025 at 11:02:49AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 14 Jul 2025 17:59:16 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> >
...
> > 
> > diff --cc include/linux/module.h
> > index 3b665cb0cabe,e93cdb92ad92..000000000000
> > --- a/include/linux/module.h
> > +++ b/include/linux/module.h
> > @@@ -584,17 -608,6 +584,16 @@@ struct module 
> >   #define MODULE_ARCH_INIT {}
> >   #endif
> >   
> >  +#ifdef CONFIG_MODULES
> >  +
> > - extern int modules_disabled; /* for sysctl */
> >  +/* Get/put a kernel symbol (calls must be symmetric) */
> >  +void *__symbol_get(const char *symbol);
> >  +void *__symbol_get_gpl(const char *symbol);
> >  +#define symbol_get(x)	({ \
> >  +	static const char __notrim[] \
> >  +		__used __section(".no_trim_symbol") = __stringify(x); \
> >  +	(typeof(&x))(__symbol_get(__stringify(x))); })
> >  +
> >   #ifndef HAVE_ARCH_KALLSYMS_SYMBOL_VALUE
> >   static inline unsigned long kallsyms_symbol_value(const Elf_Sym *sym)
> >   {
> 
> This is now a conflict between the modules tree and Linus' tree.

That makes sense. The sysctl PR was merged at the end of July. It should
be fixed in the same way as described in this thread. @Daniel: Ping me
if you need any feedback from my part.

Best

-- 

Joel Granados

Download attachment "signature.asc" of type "application/pgp-signature" (660 bytes)