Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 4 Oct 2022 20:40:25 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andrew Morton <akpm@linux-foundation.org>,
        Kees Cook <keescook@chromium.org>
Cc:     Alexander Potapenko <glider@google.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the mm-stable tree with the kspp tree
Message-ID: <20221004204025.7be8a3be@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/6KqjqoIEX21PNN6ZDGZOfuo";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

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

  include/linux/fortify-string.h

between commit:

  9f7d69c5cd23 ("fortify: Convert to struct vs member helpers")

from the kspp tree and commit:

  ff901d80fff6 ("x86: kmsan: use __msan_ string functions where possible.")

from the mm-stable 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 include/linux/fortify-string.h
index b62c90cfafaf,6c8a1a29d0b6..000000000000
--- a/include/linux/fortify-string.h
+++ b/include/linux/fortify-string.h
@@@ -325,11 -282,13 +325,13 @@@ __FORTIFY_INLINE void fortify_memset_ch
  })
 =20
  /*
 - * __builtin_object_size() must be captured here to avoid evaluating argu=
ment
 - * side-effects further into the macro layers.
 + * __struct_size() vs __member_size() must be captured here to avoid
 + * evaluating argument side-effects further into the macro layers.
   */
+ #ifndef CONFIG_KMSAN
  #define memset(p, c, s) __fortify_memset_chk(p, c, s,			\
 -		__builtin_object_size(p, 0), __builtin_object_size(p, 1))
 +		__struct_size(p), __member_size(p))
+ #endif
 =20
  /*
   * To make sure the compiler can enforce protection against buffer overfl=
ows,

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmM7/4kACgkQAVBC80lX
0Gx2xwf+O+5/lPFttzn6ykSEIZ33GeDcFcXJlOxXEHqrdmAiMLoR7JTG7zdoHMRK
FWR6Pogs5X5ZvP+BrPzcI9hOqQGPg1vOZRoKWPEzNDDLtoHzNGPNJAXP6+hQv+vd
+GCscgesVaYPRyEWIsDx/+Waloxpem+4FDkk6/DO2Oi6y+Tx0exkgD8IoFweutxJ
Gc6BkWxNcZkHIlxAfoGCDQKhtNi8nul3mCWvcSihpRCEURED2FIWM8N2sglIBN2m
mZhI785BoJliFpSMwKOgEvxkw6VFj/jDgEvVNlGGB8AUSKnUSghSVbNfYiTyFynC
dk1tesum4NHV+WPvaGLYVhfFFSqYBw==
=0ELm
-----END PGP SIGNATURE-----

--Sig_/6KqjqoIEX21PNN6ZDGZOfuo--