From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91854C433E0 for ; Wed, 17 Jun 2020 19:53:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5220621789 for ; Wed, 17 Jun 2020 19:53:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="iIe2Vswy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5220621789 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id A92766B0006; Wed, 17 Jun 2020 15:53:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A4C2A6B0007; Wed, 17 Jun 2020 15:53:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 92F186B0007; Wed, 17 Jun 2020 15:53:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0221.hostedemail.com [216.40.44.221]) by kanga.kvack.org (Postfix) with ESMTP id 7CA196B0005 for ; Wed, 17 Jun 2020 15:53:57 -0400 (EDT) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 4455455A13 for ; Wed, 17 Jun 2020 19:53:57 +0000 (UTC) X-FDA: 76939754514.12.hat88_36068e226e0a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin12.hostedemail.com (Postfix) with ESMTP id 0C0A2182EB8EF for ; Wed, 17 Jun 2020 19:53:57 +0000 (UTC) X-HE-Tag: hat88_36068e226e0a X-Filterd-Recvd-Size: 3787 Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by imf39.hostedemail.com (Postfix) with ESMTP for ; Wed, 17 Jun 2020 19:53:56 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id v14so1808139pgl.1 for ; Wed, 17 Jun 2020 12:53:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=HspOBWQFNVTqHKcQjJ7DMFYjwVDK4nykbOjxs8oECug=; b=iIe2Vswy0TY+sRYv+pLytwjoHEIfNisAagX0KZ0vRZecyk0Pd9/p0rl68+ExjofQ3J VHCh76x8fe+irdOQXTRgFjqJ47+41aIgdVqDJBkghAl1xDUzcd9AO/I9Mwv71GdOvnKC ROQqZdM2cbUEhVUyNQZ8WzcQO1FaU2yp/4hWU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=HspOBWQFNVTqHKcQjJ7DMFYjwVDK4nykbOjxs8oECug=; b=X/ePC2WTTasd9OUJK/99eHwUEXOeeEs94ZBIojc+0v4w697fM278x3v8FkjiZT8FTu Q0osg471K0YYXiVXP3hCGSLt7ToGh1y5X1IXVOmB4DKJPbKUtrAbC85np/enKyxMGVhs MMwqqNdgIeMb04468QCm8HJ5Y6VEa7Rew9ykfFrflNPFBIhqljdL89lZTTWxc2BJsNcX 4IftYz5btUiiaSJqHV5bSw4QA9wc37Y55H+xoDyLIN/37puoU7Wk4hBFhyTYEYcTzkPO HjRifNtIfklMsYY60kyNH2X1gtxiEjIL4z3Fhx365+fWOixCg+A1UDu6CKo95a9dhW9Y 14gw== X-Gm-Message-State: AOAM532Nl+xFsb4Q6UgeflziEMR3zYlqVX8R3U3BiX/lLPKQQ58V2kLW NceGW/GfjOZ3n3hfwMjIV/o0DA== X-Google-Smtp-Source: ABdhPJzU2MrCywm/yIqXZrWJqCrHeLxWKzoBvu0raHnNG08mgZ92LJXSezd98/LJ4Rz5kge/t19oGQ== X-Received: by 2002:a63:4e64:: with SMTP id o36mr393204pgl.101.1592423635779; Wed, 17 Jun 2020 12:53:55 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id w18sm625330pfq.121.2020.06.17.12.53.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2020 12:53:53 -0700 (PDT) From: Kees Cook To: Andrew Morton Cc: Kees Cook , Vlastimil Babka , Roman Gushchin , Christoph Lameter , Alexander Popov , Pekka Enberg , David Rientjes , Joonsoo Kim , vinmenon@codeaurora.org, Matthew Garrett , Jann Horn , Vijayanand Jitta , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 0/2] mm: Expand CONFIG_SLAB_FREELIST_HARDENED to include SLAB and SLOB Date: Wed, 17 Jun 2020 12:53:47 -0700 Message-Id: <20200617195349.3471794-1-keescook@chromium.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Rspamd-Queue-Id: 0C0A2182EB8EF X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Hi, In reviewing Vlastimil Babka's latest slub debug series, I realized[1] that several checks under CONFIG_SLAB_FREELIST_HARDENED weren't being applied to SLAB (or SLOB). Fix this by expanding the Kconfig coverage and moving the cache_from_obj() check back into the common code. Additionally adds a simple double-free test for SLAB. Thanks! -Kees [1] https://lore.kernel.org/lkml/202006171039.FBDF2D7F4A@keescook/ Kees Cook (2): mm: Expand CONFIG_SLAB_FREELIST_HARDENED to include SLAB and SLOB slab: Add naive detection of double free init/Kconfig | 8 ++++---- mm/slab.c | 22 ++++++++++++---------- mm/slab.h | 31 +++++++++++++++++++++++++++++++ mm/slub.c | 25 +------------------------ 4 files changed, 48 insertions(+), 38 deletions(-) --=20 2.25.1