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:   Wed, 5 Oct 2022 17:39:04 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     Kees Cook <keescook@chromium.org>,
        Alexander Potapenko <glider@google.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the mm-stable tree with the kspp
 tree
Message-ID: <20221005173904.12540ffe@canb.auug.org.au>
In-Reply-To: <20221004204025.7be8a3be@canb.auug.org.au>
References: <20221004204025.7be8a3be@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/4y4jTsp8=i3rlvQ4LDEz0E5";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

On Tue, 4 Oct 2022 20:40:25 +1100 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>=20
> Today's linux-next merge of the mm-stable tree got a conflict in:
>=20
>   include/linux/fortify-string.h
>=20
> between commit:
>=20
>   9f7d69c5cd23 ("fortify: Convert to struct vs member helpers")
>=20
> from the kspp tree and commit:
>=20
>   ff901d80fff6 ("x86: kmsan: use __msan_ string functions where possible.=
")
>=20
> from the mm-stable tree.
>=20
> 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
>=20
> 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 ar=
gument
>  - * 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 over=
flows,

This is now a conflict between the mm-stable tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/4y4jTsp8=i3rlvQ4LDEz0E5
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmM9JogACgkQAVBC80lX
0GwIZggApjYw82dVFfmTq72uxz8Uh2M/14G4pOF3PhfTWl1KdABDnsEY5sQVI9Y2
6Qw2VS6DvCOtKw7s2N2NKsDhcI1EjoujdpYvBv9mLljOi0JZbckepvSfi0AsjV5H
XTPXbAFm/Q1A1If9+H/Uk68r4XIusJDSzPkuvOoBXig21Hw/Wf9aqAO8/IkYIFda
y/sC4h+XT6yUSCKKqunL3X9xNepzg8lDJx8MCNwZ4Lftf7KAHZ1g4Pjn5ih+cmdS
QfLnt2lLGvP4KyKzdsDbyDnO1HVuB2IxyBJCw7K7zJoppj5KIdNcCOeShaJ7AZDC
292SrElD/rcpgDlRL9tJNU0QV+h5QA==
=JZVb
-----END PGP SIGNATURE-----

--Sig_/4y4jTsp8=i3rlvQ4LDEz0E5--