Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 8 May 2020 18:05:24 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jiri Kosina <jikos@kernel.org>,
        Josh Poimboeuf <jpoimboe@redhat.com>,
        Miroslav Benes <mbenes@suse.cz>,
        Petr Mladek <pmladek@suse.com>,
        Joe Lawrence <joe.lawrence@redhat.com>,
        Jessica Yu <jeyu@kernel.org>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Peter Zijlstra <peterz@infradead.org>
Subject: linux-next: manual merge of the livepatching tree with the modules
 tree
Message-ID: <20200508180524.6995b07e@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/zQSwp35U6Oy695F0wOUlMTo";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/zQSwp35U6Oy695F0wOUlMTo
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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.

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.

--=20
Cheers,
Stephen Rothwell

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);
  }
 =20
 +static int module_enforce_rwx_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
 +				       char *secstrings, struct module *mod)
 +{
 +	const unsigned long shf_wx =3D SHF_WRITE|SHF_EXECINSTR;
 +	int i;
 +
 +	for (i =3D 0; i < hdr->e_shnum; i++) {
 +		if ((sechdrs[i].sh_flags & shf_wx) =3D=3D 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 */
 =20
  #ifdef CONFIG_LIVEPATCH
  /*

--Sig_/zQSwp35U6Oy695F0wOUlMTo
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl61EsUACgkQAVBC80lX
0Gy+Nwf/QwPmeO+0MwhkZtGBK96zqtJ8AtW7o6pMslU2qtP0RqQmaS/wFfQo/7bk
wliasNDFacduHLf/I82FGoG0r1TIiVWCPuiNAPdTqfb7rldqrFnb07NDfzLhwSFQ
+IJyKoZAByvDTKtlV6Q6HC9Ki8ecKMwT37EG1lUQgCyX23mET7sf3vUQgDqMM8Wo
TtneBKwOGSkRzELMAEcJwwgh4Gnrt0SgW1bG4q0OvdhVOMvjaVb+h0G7HdPHFyVD
sz0yCzFU58+2Qqxdfi3W8AfRUNDoOcMTE06txH0GehjfJBCQouu6IPcrJz0gO/92
eSPq9C+1Bu/qShR4rBxsIfi15RKmfw==
=QMwq
-----END PGP SIGNATURE-----

--Sig_/zQSwp35U6Oy695F0wOUlMTo--