From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D093BC433DF for ; Fri, 5 Jun 2020 06:56:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AF61020823 for ; Fri, 5 Jun 2020 06:56:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591340178; bh=Fueqi0VOnS4+2D9oOQ/CGjLpvS+cOsGXs8w5iOdBcB0=; h=Date:From:To:cc:Subject:In-Reply-To:References:List-ID:From; b=E1SssWtU9Et6T7qji+c6+vpL8XpD96ueuRDZ0zR0X+BsQ8F52dlvVyYgnGLz92/b9 jiusyNp+Xvy8vG0Bz2EoYtfyYCOg/fs33NjI9uf7XSYr4gmupkOS2VahxJs/+sWQlf fkXLAGU4DvEVGcW3z8ZC0Q60fDnwI4/viJN0WrjQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726123AbgFEG4S (ORCPT ); Fri, 5 Jun 2020 02:56:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:53822 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726024AbgFEG4R (ORCPT ); Fri, 5 Jun 2020 02:56:17 -0400 Received: from pobox.suse.cz (nat1.prg.suse.com [195.250.132.148]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2063A207ED; Fri, 5 Jun 2020 06:56:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591340176; bh=Fueqi0VOnS4+2D9oOQ/CGjLpvS+cOsGXs8w5iOdBcB0=; h=Date:From:To:cc:Subject:In-Reply-To:References:From; b=2j6uEMWbPUNJk8U83wz+VEGBDqTNxoRXGj8jeev6zL+SaPUgKnAyCgTXrutW4Jzun OxK9j6H8oCO3mCE1pe01pq8bipzT5aamc3pXaiZ7tSHl2t+j3YecG1rzi7Cv7baIhS obWDnxD9KHlkrr3Ppfw1rSl5UT3xK7TENeIZOj0w= Date: Fri, 5 Jun 2020 08:56:12 +0200 (CEST) From: Jiri Kosina To: Stephen Rothwell cc: Josh Poimboeuf , Miroslav Benes , Petr Mladek , Joe Lawrence , Jessica Yu , Linux Next Mailing List , Linux Kernel Mailing List , Peter Zijlstra Subject: Re: linux-next: manual merge of the livepatching tree with the modules tree In-Reply-To: <20200605144557.4f8e2a42@canb.auug.org.au> Message-ID: References: <20200508180524.6995b07e@canb.auug.org.au> <20200605144557.4f8e2a42@canb.auug.org.au> User-Agent: Alpine 2.21 (LSU 202 2017-01-01) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 5 Jun 2020, Stephen Rothwell wrote: > > Today's linux-next merge of the livepatching tree got a conflict in: > > > > kernel/module.c > > > > between commits: > > > > db991af02f11 ("module: break nested ARCH_HAS_STRICT_MODULE_RWX and STRICT_MODULE_RWX #ifdefs") > > 5c3a7db0c7ec ("module: Harden STRICT_MODULE_RWX") > > > > from the modules tree and commit: > > > > e6eff4376e28 ("module: Make module_enable_ro() static again") > > > > from the livepatching tree. > > > > diff --cc kernel/module.c > > index c69291362676,a26343ea4d50..000000000000 > > --- a/kernel/module.c > > +++ b/kernel/module.c > > @@@ -2055,29 -2023,20 +2042,30 @@@ static void module_enable_nx(const stru > > frob_writable_data(&mod->init_layout, set_memory_nx); > > } > > > > +static int module_enforce_rwx_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, > > + char *secstrings, struct module *mod) > > +{ > > + const unsigned long shf_wx = SHF_WRITE|SHF_EXECINSTR; > > + int i; > > + > > + for (i = 0; i < hdr->e_shnum; i++) { > > + if ((sechdrs[i].sh_flags & shf_wx) == shf_wx) > > + return -ENOEXEC; > > + } > > + > > + return 0; > > +} > > + > > #else /* !CONFIG_STRICT_MODULE_RWX */ > > +/* module_{enable,disable}_ro() stubs are in module.h */ > > static void module_enable_nx(const struct module *mod) { } > > + static void module_enable_ro(const struct module *mod, bool after_init) {} > > -#endif /* CONFIG_STRICT_MODULE_RWX */ > > -static void module_enable_x(const struct module *mod) > > +static int module_enforce_rwx_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, > > + char *secstrings, struct module *mod) > > { > > - frob_text(&mod->core_layout, set_memory_x); > > - frob_text(&mod->init_layout, set_memory_x); > > + return 0; > > } > > -#else /* !CONFIG_ARCH_HAS_STRICT_MODULE_RWX */ > > -static void module_enable_nx(const struct module *mod) { } > > -static void module_enable_x(const struct module *mod) { } > > -#endif /* CONFIG_ARCH_HAS_STRICT_MODULE_RWX */ > > - > > +#endif /* CONFIG_STRICT_MODULE_RWX */ > > > > #ifdef CONFIG_LIVEPATCH > > /* > > This is now a conflict between the modules tree and Linus' tree. I've made Linus aware of this coming when sending livepatching tree, but given the fact that the modules tree hasn't been merged yet, Jessica, I believe it'd make sense to point it out again once sending your tree. Thanks, -- Jiri Kosina SUSE Labs