linux-next: manual merge of the slab tree with the mm-stable, mm trees

[Stephen Rothwell]

Hi all,

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

  mm/kasan/quarantine.c

between commits:

  773688a6cb24 ("kasan: use stack_depot_put for Generic mode")
  435736586ddc ("kasan: stop leaking stack trace handles")

from the mm-stable, mm trees and commit:

  72786c0a3dc5 ("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.

-- 
Cheers,
Stephen Rothwell

diff --cc mm/kasan/quarantine.c
index 8afa77bc5d3b,138c57b836f2..000000000000
--- a/mm/kasan/quarantine.c
+++ b/mm/kasan/quarantine.c
@@@ -143,10 -143,7 +143,9 @@@ static void *qlink_to_object(struct qli
  static void qlink_free(struct qlist_node *qlink, struct kmem_cache *cache)
  {
  	void *object = qlink_to_object(qlink, cache);
 -	struct kasan_free_meta *meta = kasan_get_free_meta(cache, object);
 +	struct kasan_free_meta *free_meta = kasan_get_free_meta(cache, object);
- 	unsigned long flags;
 +
 +	kasan_release_object_meta(cache, object);
  
  	/*
  	 * If init_on_free is enabled and KASAN's free metadata is stored in
@@@ -156,15 -153,15 +155,9 @@@
  	 */
  	if (slab_want_init_on_free(cache) &&
  	    cache->kasan_info.free_meta_offset == 0)
 -		memzero_explicit(meta, sizeof(*meta));
 -
 -	/*
 -	 * As the object now gets freed from the quarantine, assume that its
 -	 * free track is no longer valid.
 -	 */
 -	*(u8 *)kasan_mem_to_shadow(object) = KASAN_SLAB_FREE;
 +		memzero_explicit(free_meta, sizeof(*free_meta));
  
- 	if (IS_ENABLED(CONFIG_SLAB))
- 		local_irq_save(flags);
- 
  	___cache_free(cache, object, _THIS_IP_);
- 
- 	if (IS_ENABLED(CONFIG_SLAB))
- 		local_irq_restore(flags);
  }
  
  static void qlist_free_all(struct qlist_head *q, struct kmem_cache *cache)

Attachment: pgpTrFdQYyOJT.pgp
Description: OpenPGP digital signature