linux-kernel - linux-next: manual merge of the slab tree with the slab-fixes tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <aYShOPWbajIlXx_i@sirena.org.uk>
Date: Thu, 5 Feb 2026 13:55:04 +0000
From: Mark Brown <broonie@...nel.org>
To: Vlastimil Babka <vbabka@...e.cz>
Cc: Hao Ge <hao.ge@...ux.dev>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the slab tree with the slab-fixes tree

Hi all,

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

  mm/slub.c

between commit:

  3a38d13f90d4e ("mm/slab: Add alloc_tagging_slab_free_hook for memcg_alloc_abort_single")

from the slab-fixes tree and commit:

  bdc9282f78096 ("slab: remove the do_slab_free() fastpath")

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.

diff --cc mm/slub.c
index f9d1f6b69305c,102fb47ae0133..0000000000000
--- a/mm/slub.c
+++ b/mm/slub.c
@@@ -6689,12 -6094,8 +6094,12 @@@ void slab_free(struct kmem_cache *s, st
  static noinline
  void memcg_alloc_abort_single(struct kmem_cache *s, void *object)
  {
 +	struct slab *slab = virt_to_slab(object);
 +
 +	alloc_tagging_slab_free_hook(s, slab, &object, 1);
 +
  	if (likely(slab_free_hook(s, object, slab_want_init_on_free(s), false)))
- 		do_slab_free(s, slab, object, object, 1, _RET_IP_);
 -		__slab_free(s, virt_to_slab(object), object, object, 1, _RET_IP_);
++		__slab_free(s, slab, object, object, 1, _RET_IP_);
  }
  #endif
  

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)