Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35;
Date:   Mon, 27 Nov 2023 12:29:02 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Vlastimil Babka <vbabka@suse.cz>,
        Andrew Morton <akpm@linux-foundation.org>
Cc:     Andrey Konovalov <andreyknvl@gmail.com>,
        Andrey Konovalov <andreyknvl@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 slab tree with the mm tree
Message-ID: <20231127122902.566de6d1@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/9qvVD_TXCr7c=szVwJfkcnk";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

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

  mm/kasan/quarantine.c

between commit:

  f644ee35cf5b ("kasan: use stack_depot_put for Generic mode")

from the mm tree and commit:

  40a038d5fc11 ("KASAN: remove code paths guarded by CONFIG_SLAB")

from the slab 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 mm/kasan/quarantine.c
index 265ca2bbe2dd,138c57b836f2..000000000000
--- a/mm/kasan/quarantine.c
+++ b/mm/kasan/quarantine.c
@@@ -143,22 -143,7 +143,21 @@@ static void *qlink_to_object(struct qli
  static void qlink_free(struct qlist_node *qlink, struct kmem_cache *cache)
  {
  	void *object =3D qlink_to_object(qlink, cache);
 -	struct kasan_free_meta *meta =3D kasan_get_free_meta(cache, object);
 +	struct kasan_alloc_meta *alloc_meta =3D kasan_get_alloc_meta(cache, obje=
ct);
 +	struct kasan_free_meta *free_meta =3D kasan_get_free_meta(cache, object);
- 	unsigned long flags;
 +
 +	if (alloc_meta) {
 +		stack_depot_put(alloc_meta->alloc_track.stack);
 +		stack_depot_put(alloc_meta->aux_stack[0]);
 +		stack_depot_put(alloc_meta->aux_stack[1]);
 +		__memset(alloc_meta, 0, sizeof(*alloc_meta));
 +	}
 +
 +	if (free_meta &&
 +	    *(u8 *)kasan_mem_to_shadow(object) =3D=3D KASAN_SLAB_FREETRACK) {
 +		stack_depot_put(free_meta->free_track.stack);
 +		free_meta->free_track.stack =3D 0;
 +	}
 =20
  	/*
  	 * If init_on_free is enabled and KASAN's free metadata is stored in

--Sig_/9qvVD_TXCr7c=szVwJfkcnk
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVj8N4ACgkQAVBC80lX
0GyebAgAoWkglSXrgn+ihSDD0b2x8HHiVEXkcAt3Wru2wnaw31Lya+Y6xuJ7t4X7
dzOFrxIL14sIwDhwTeL5Iangh/2oPsnfI0j0qOc5FGVdZ8NgwCYkVEW6HEMb/sj7
obo6X0mnydSd3F+1ChzbVU5BOPM7KdB0T13fy8lfq8XcljyBs8qHN+29gbTf1eaD
Iq5nBLsAkADutX+KKvF0o7oaefOE6H0A1EFsULCLTh/ejpxsOOQ9gO/GNAYT1230
cwqjxw+4jigsGw4H1jjH3M4eyYVIZTZoIDdzDdhWOr+2W4PA/qUj1RK9IzyBwWW9
Ups9ksfnmvokPpOOuViolSYgBIr+1A==
=UaKz
-----END PGP SIGNATURE-----

--Sig_/9qvVD_TXCr7c=szVwJfkcnk--