From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3CC6A446BE8 for ; Tue, 11 Aug 2026 14:12:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786457572; cv=none; b=UhbR22+lLy9iv67wrb1D4bhQpvmptKJzjGRm99uTvSWzMnbPxCt7OFtPasPBJpoTtbNqI6F4iQCdocDiRgDdWA3nzxxAGREbw9hUFB0yfdGEt9pG0jOjQkkRquLgIkk36YJYs/pmlS2Ub92DHLZ1OTUvYJwpH3W4lxORg36Z6yE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786457572; c=relaxed/simple; bh=TaCmrurOP6eiSThHEAhj0hS/qDuy18I8xMkgu8ZEriI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=K2iJ2S171dmxs5PzQFALC2ewXFQHC17Pwi5UuP0ZeNsY1Wyh69TsaIUs9Bti0SE0pnZeMjWq37TtIjCzswqTrkT4OUWrEwQTSnaZKWPpU65mNh4wY/BLxfBUDNcqQNZZ/X0Rmtl6k9aNrEBdciS7tQfbQv924qI4s+VQ28c0fHM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=VCoZkRgv; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VCoZkRgv" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-493b966dd74so20047125e9.3 for ; Tue, 11 Aug 2026 07:12:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786457569; x=1787062369; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Ah0y0gDveI06pCiQf0Bv3vLT+VZq6BOea0NjGFqGqkY=; b=VCoZkRgvC0JaViWUUr7N3sphR5tdb76kTdzSdtKLvZsR+U8T/uOHobnsNRNLsIKzP0 uQNSH9tq2mBsJNI7nAzTT6GzmX021iqfbjaW4mNGbW8Eap41P/FJAIozeAgreUjerNK6 Zma8+nWb6pntXWWENzBKNkFAVDP55lRv7yOcXrsOU6sK1wWP+3nXiRlhcjs8fzg0R3qs i8TY3vq02NA3WclC1SkDIHFtmFYamcSG6V7y7gHqPSz+oezImVm11KDy0GXcpxdZxsI9 DW9T3885MW4N+1E6oXtE2HoOSstgLgvYMImN1L1pKT34ruICxz5dbi0GcKdy9WvXM2m9 qY/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786457569; x=1787062369; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=Ah0y0gDveI06pCiQf0Bv3vLT+VZq6BOea0NjGFqGqkY=; b=bOK3qiDM4+d3QJ+nTo9CItk2u34hEK9YydIxLHfehMmLROQJObxSA9zEALO8DHxzYm 3A4FYXQKYgaXjIznXMF4u/6aSVoIj3kuD4R7+4z2oUOHDVSFpg4ZszZTRTuqUEmUMGJl nbJYGH2NFpRiohmPGWocFGSn5q9tChS85WFBGHijTcpBckc8I/owp1wWjE0QPEpLeSR3 WSHbe9RsaYvS+XnQWLmnnwGBNeqxvCbmN6i1Mp1psudVSMB9c5CevJK/5uWZE4f4chRH miA51YSU6+8URjXLtqP86jZRQ1bvD+wFKpnWNCjq7LTJNg2wlwr5IdFNzNCJsZI3+dss /TsA== X-Forwarded-Encrypted: i=1; AHgh+RphRGXwTpJ/ZS+eVlhQI4zBnTh4PFYoavW4Q9Ez5BcYArQpDNbWR6HeqPpjU1VbziiW3A2esGfLmgOZPag=@vger.kernel.org X-Gm-Message-State: AOJu0YyWnPAQipnTTpbr7pwb1J33a4+yu1ffEJt+P+1istr1BZznuxHX abvrSsu0iBRYxuydXERfqt3CrVkwDrlyRotWC3Wmjww66IAqE6yePjfc X-Gm-Gg: AR+sD12XawEQqmiV5Vptm3Enj3dr7KCVbw1SFIrCHx2ww7Xuruo/yJxjpHWrSKN9Lt8 Hai0rjbZAsLXHSNOPhgjlBF8Ip4MsDZaj5z3sVJGirHIG37vwd2YwR8pIHaNZgQt+904NkxtU9z Y5YcNG8Fug9RVJ2tuND38bL1pxhLNLnhbM4swJqCNDqhlBDJKwolEdvoaQm4V3vNuX9hPvlzuCB EqCT/voR/Q1KGQE76sUcKECNbytUyrAYe9wHH3sUbfkOqJpSVaS/MXyhLKvRHueCNeYmG71C91l UBUM5OoMTRhygWczSO9cKd0CAFcgjzZcA8TEisXdfhbEbUytCXRriIlpPKedmCk/83cDlJBAc5A VyltxFocMhW/6tnYpdS4NtF7zsoeFT+0UGijRJjTi1x6tnNXbbQ21S4+KbYWkJjmf3iOhtFON9i LTGfP6RssP5eAN6BsWGv+ZrWkr+zPSePGmzjbcgbt8nEgheiv+9NgWP9Uww3AZHa8n66/rOLTkF wrPQSmtGmRSj2iQ6kWnHw/WQwuJOx4xqkweAcQsXwS+pv3t+o0sMmUi1xATTpRMy2gl/MrpOWrq 9i9mXs5bPteM/QObrK7274jL//WdQ60WLYPrwG21HS7E+RiifMCNNFE5uMgmAxtrgjwk0Q== X-Received: by 2002:a05:600c:3103:b0:495:737a:7afe with SMTP id 5b1f17b1804b1-4997846c317mr57654805e9.15.1786457568853; Tue, 11 Aug 2026 07:12:48 -0700 (PDT) Received: from localhost.localdomain (dynamic-2a02-3100-a133-e401-bc8e-d36c-2d08-c5e0.310.pool.telefonica.de. [2a02:3100:a133:e401:bc8e:d36c:2d08:c5e0]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4814a5be29fsm4464099f8f.12.2026.08.11.07.12.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 11 Aug 2026 07:12:48 -0700 (PDT) From: Karl Mehltretter To: Vlastimil Babka , Harry Yoo , Andrew Morton Cc: Karl Mehltretter , Rasmus Villemoes , Hao Li , Christoph Lameter , David Rientjes , Roman Gushchin , Catalin Marinas , Kees Cook , "Gustavo A. R. Silva" , linux-hardening@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev Subject: [PATCH v2 2/3] slab: check for ZERO_SIZE_PTR by exact match Date: Tue, 11 Aug 2026 16:12:39 +0200 Message-Id: <20260811141240.62519-3-kmehltretter@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20260811141240.62519-1-kmehltretter@gmail.com> References: <20260811141240.62519-1-kmehltretter@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ZERO_OR_NULL_PTR() returns true for every value less than or equal to ZERO_SIZE_PTR. With the sentinel raised to ARCH_KMALLOC_MINALIGN, up to 128 on some architectures, the helper matches additional values that are neither NULL nor the sentinel. Compare explicitly against NULL and ZERO_SIZE_PTR. Store the argument in an unsigned long temporary to support both pointer and integer address arguments while evaluating it only once. This also changes check_bogus_address() in hardened usercopy: nonzero addresses below ZERO_SIZE_PTR no longer cause its null-address abort. Apart from hardened usercopy, direct in-tree users apply the helper to allocation results or explicit sentinel values. Assisted-by: Claude:claude-fable-5 Signed-off-by: Karl Mehltretter --- include/linux/slab.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/linux/slab.h b/include/linux/slab.h index 3e012cc4f001e..023e10ab77f8d 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -270,8 +270,12 @@ enum _slab_flag_bits { #define ZERO_SIZE_PTR ((void *)(ARCH_KMALLOC_MINALIGN > 16 ? \ ARCH_KMALLOC_MINALIGN : 16)) -#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \ - (unsigned long)ZERO_SIZE_PTR) +#define ZERO_OR_NULL_PTR(x) \ +({ \ + unsigned long __zon_ptr = (unsigned long)(x); \ + __zon_ptr == 0 || \ + __zon_ptr == (unsigned long)ZERO_SIZE_PTR; \ +}) #include -- 2.53.0