Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1630106pxb; Thu, 4 Mar 2021 16:57:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJxf22Waz+qhh9DCWnAf0Ua3973I1F7XYKGE9mJN2iL7XF4DG6CtD5lz0z41A1x2KGHqIIBf X-Received: by 2002:a05:6e02:1c0b:: with SMTP id l11mr6006695ilh.187.1614905862816; Thu, 04 Mar 2021 16:57:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614905862; cv=none; d=google.com; s=arc-20160816; b=JVQAAHW5QCOz1kb3jKD2p46Jjw8xjHE/rIkakJsaYDBKvCLrEhEz+OKsSOV/MOnHNT NaFdwHGGxqM1Z7ndo6z5tx+yd+wqr81mvjfMEtQF2WDBFdyfAYGsXPwkHHry33NMRYHF APdnCx8HXSkdUr/yh/JQ9jTvRC2mXiTrVznyvVYd8VO0/MGn9CI5cz5hJx2dgrcLudnf 0pYpgB+WSx6hiDdQ1XRFXQ5DnlDtRwdw5LundJ0y76IPwrbwmfCXtvIAdZXFyBHWVkVB 2vFjUhmgnHZVO3nTD44stntxAYQy+OgUXobt4ROqarNNK9ddfH2ePrukxj9lS2INx5TP A+Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:mime-version:message-id:date :sender:dkim-signature; bh=4CjcEvJ61GkUIoAFgSTKRu5Tq1H6wn08RVLBK2Lt0I0=; b=kb/nU83mmDFC3JXNqcSgpQQf7xj0k2+wDVchMvfnUb6Eg/XfK7wLroB7QCJx6Nix7p AhtLCJbyovTkZyQxEW9Hk6BphJ+hZfSQBcCP4m/CCkZT8eIviXjBUeSuZvQgcEyitVwr v7ky63KWBgeD0yUVXP5Uk4upIxTbGOL5RJTGJxzKmCtdbGJHDV/vZL6AoR3VHyb7afB1 aVIUTlIOQjERy07og4YkU6MG5RNkfKsQTQHwOsEf0Xy2wYZSIn3JQ0w6YmlZDH5yp0Y6 5KZLfWsnb2dGSwnWKwnvymaI/hTtajb+f0pjWeSo5WRPHWSPapgTLdP0J1SNPnr9ufvQ BVwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b="kQcOCQ/c"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m17si1069732jaj.76.2021.03.04.16.57.29; Thu, 04 Mar 2021 16:57:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b="kQcOCQ/c"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232795AbhCDUxn (ORCPT + 99 others); Thu, 4 Mar 2021 15:53:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232977AbhCDUxm (ORCPT ); Thu, 4 Mar 2021 15:53:42 -0500 Received: from mail-wr1-x449.google.com (mail-wr1-x449.google.com [IPv6:2a00:1450:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 079FDC061756 for ; Thu, 4 Mar 2021 12:53:02 -0800 (PST) Received: by mail-wr1-x449.google.com with SMTP id p15so12969wre.13 for ; Thu, 04 Mar 2021 12:53:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:message-id:mime-version:subject:from:to:cc; bh=4CjcEvJ61GkUIoAFgSTKRu5Tq1H6wn08RVLBK2Lt0I0=; b=kQcOCQ/cMB/X2WRSuwsg8LBq8X+nEul9d6IKcKn7tPT4uxnd5PINYXXdeMrZdAE3Ej zqbHl++wLZTRVvYlU6lwOasPy3DOcMt0FVu+/aCX6o2vfuEpE1DFuOUHZh4FoD0sx7MW dgZQizaqek8333Yq8IIeacWBNyot8v6B/FdhLhlW8Aju/OFuVbxcPdSIkysxPYTK6KdC ceAmKMO0lt/2+V3pFnTKJRcKZRgFbg0XO5rCQKb8OkxZRW2o/I0qYJnCezuIQiYNe3dz 6xinkRvy1YAnPfeZjNGHpn2UaEQw67OZisxF6BqziY46z7vtzn27GihW4JeIN601IeB+ jtAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:message-id:mime-version:subject:from :to:cc; bh=4CjcEvJ61GkUIoAFgSTKRu5Tq1H6wn08RVLBK2Lt0I0=; b=FZEQNN8s1ZcJYCpqteykVDlZdu95dB3/p17uux46AyW/+HnIB0lMRh7e1LoPDcuWCk hUtAX3iqjfhl0fPnVS69OA0vCQvsC5m4g013srV1u5C8oHFrEKeHoi5mdHD5jgz7zu/p oxhuMLIHs51oa2eiesR5i5j4Er1GhDPXWWy4INw2wxmZ7dZphDf4DVZ0S/SsuBW92Iz3 MbDHB6vu3BJFqF50YwNQ754ZBKgDwytie7sHgLY1qac+mh4pJ5WlpjBFSfEEHJzzCww4 q82bxHk52GhYGBb8AvhcJt46/mEAv+rc74YsUkH7kFd9IB8IBGCIGyZvof4Y4a78DxxG x3wg== X-Gm-Message-State: AOAM531vblGQxor67Low/cx2AmzAygOb0HEp8DlfaD/qcX4Ff3TVp2d4 ofXLeVeVdHYtg+PBs9ZpH2GHtIKiZA== Sender: "elver via sendgmr" X-Received: from elver.muc.corp.google.com ([2a00:79e0:15:13:adef:40fb:49ed:5ab6]) (user=elver job=sendgmr) by 2002:a7b:c18e:: with SMTP id y14mr1459027wmi.1.1614891179563; Thu, 04 Mar 2021 12:52:59 -0800 (PST) Date: Thu, 4 Mar 2021 21:52:56 +0100 Message-Id: <20210304205256.2162309-1-elver@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog Subject: [PATCH mm] kfence, slab: fix cache_alloc_debugcheck_after() for bulk allocations From: Marco Elver To: elver@google.com, akpm@linux-foundation.org Cc: glider@google.com, dvyukov@google.com, andreyknvl@google.com, jannh@google.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, kasan-dev@googlegroups.com Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org cache_alloc_debugcheck_after() performs checks on an object, including adjusting the returned pointer. None of this should apply to KFENCE objects. While for non-bulk allocations, the checks are skipped when we allocate via KFENCE, for bulk allocations cache_alloc_debugcheck_after() is called via cache_alloc_debugcheck_after_bulk(). Fix it by skipping cache_alloc_debugcheck_after() for KFENCE objects. Signed-off-by: Marco Elver --- mm/slab.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/slab.c b/mm/slab.c index 51fd424e0d6d..ae651bf540b7 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -2992,7 +2992,7 @@ static void *cache_alloc_debugcheck_after(struct kmem_cache *cachep, gfp_t flags, void *objp, unsigned long caller) { WARN_ON_ONCE(cachep->ctor && (flags & __GFP_ZERO)); - if (!objp) + if (!objp || is_kfence_address(objp)) return objp; if (cachep->flags & SLAB_POISON) { check_poison_obj(cachep, objp); -- 2.30.1.766.gb4fecdf3b7-goog