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=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 038FDC433E1 for ; Thu, 25 Jun 2020 21:56:01 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9917120768 for ; Thu, 25 Jun 2020 21:56:00 +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="VMk0Zw6J" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9917120768 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 DF96D6B0008; Thu, 25 Jun 2020 17:55:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D91496B0006; Thu, 25 Jun 2020 17:55:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C03656B0007; Thu, 25 Jun 2020 17:55:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0105.hostedemail.com [216.40.44.105]) by kanga.kvack.org (Postfix) with ESMTP id A53376B0003 for ; Thu, 25 Jun 2020 17:55:59 -0400 (EDT) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 37E8B2DFC for ; Thu, 25 Jun 2020 21:55:59 +0000 (UTC) X-FDA: 76969092438.07.hall29_4e05fd526e50 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin07.hostedemail.com (Postfix) with ESMTP id 0BFE01803FD61 for ; Thu, 25 Jun 2020 21:55:59 +0000 (UTC) X-HE-Tag: hall29_4e05fd526e50 X-Filterd-Recvd-Size: 4878 Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by imf03.hostedemail.com (Postfix) with ESMTP for ; Thu, 25 Jun 2020 21:55:58 +0000 (UTC) Received: by mail-pg1-f193.google.com with SMTP id w2so3161738pgg.10 for ; Thu, 25 Jun 2020 14:55:58 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=71I6z5szBhKim0wgDhUvujL5ZR5Eh3Fxzt3bloEgVL0=; b=VMk0Zw6JIilxDB2FbkGpjPfL/X2M4XMT9HR1Xa4byqvRS92XoM32NszNcobm+xX3SO koLQok/7rd9CYszwpisV556fJmVvxWPDT7Aj5U4uDp3x9Bzwz6sfpU46hntjIt5/m/Gd 4JQ3yP9GjK68VZAAZF6NwKY8jd9a1tbWJ2KGg= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=71I6z5szBhKim0wgDhUvujL5ZR5Eh3Fxzt3bloEgVL0=; b=au74t8cQPRQi15A/7Iy36vW4b1wZemQ2lOOWMhqHaC/3mzShCtewZu9lsn5L0dz6d1 Aj0327jv1Sgt635R/bLzUJ4tCxE2x7QpM22rzawvhuWJcxBsiHdjuhI1FR0qCHkkc9eG 1CkIk/Mf97CQ926rruaSy+8gen28c4J/qtS2xbwUmCbZWbheIicpbIrrlGk6i+6ygd2E tfsN3VAu7QFU0RelX/pGFsHeR4dpNx7fafqYYekxaQNYdZ7jWROQFBrSijRCphOmMy9v +w28N8bom+ERLZehTO4lWzMx3ZB6sce6zaQ9mbM2GV5awOpel0qqmo/ymZkXBIfqJRPb E1jQ== X-Gm-Message-State: AOAM532oQu+adHYNb7nbrJhra9b9wru5Ke8hJk+EPIgDRadu1whTjGOO Q+yq2fzI7VGxNlvvCEs9iDfqGg== X-Google-Smtp-Source: ABdhPJw2R/tP8rME+1EtDAT2i3js5LC+uVczTVn3tgK6kguv96cWBfloLw7fIXNJwNDeNNnwbyBpRg== X-Received: by 2002:aa7:91cc:: with SMTP id z12mr22931068pfa.239.1593122157514; Thu, 25 Jun 2020 14:55:57 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id 64sm16026524pgb.63.2020.06.25.14.55.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 14:55:56 -0700 (PDT) From: Kees Cook To: akpm@linux-foundation.org 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 v2 2/2] slab: Add naive detection of double free Date: Thu, 25 Jun 2020 14:55:48 -0700 Message-Id: <20200625215548.389774-3-keescook@chromium.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200625215548.389774-1-keescook@chromium.org> References: <20200625215548.389774-1-keescook@chromium.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 0BFE01803FD61 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 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: Similar to commit ce6fa91b9363 ("mm/slub.c: add a naive detection of double free or corruption"), add a very cheap double-free check for SLAB under CONFIG_SLAB_FREELIST_HARDENED. With this added, the "SLAB_FREE_DOUBLE" LKDTM test passes under SLAB: lkdtm: Performing direct entry SLAB_FREE_DOUBLE lkdtm: Attempting double slab free ... ------------[ cut here ]------------ WARNING: CPU: 2 PID: 2193 at mm/slab.c:757 ___cache _free+0x325/0x390 Signed-off-by: Kees Cook --- mm/slab.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/mm/slab.c b/mm/slab.c index ebac5e400ad0..bbff6705ab2b 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -749,6 +749,16 @@ static void drain_alien_cache(struct kmem_cache *cac= hep, } } =20 +/* &alien->lock must be held by alien callers. */ +static __always_inline void __free_one(struct array_cache *ac, void *obj= p) +{ + /* Avoid trivial double-free. */ + if (IS_ENABLED(CONFIG_SLAB_FREELIST_HARDENED) && + WARN_ON_ONCE(ac->avail > 0 && ac->entry[ac->avail - 1] =3D=3D objp)= ) + return; + ac->entry[ac->avail++] =3D objp; +} + static int __cache_free_alien(struct kmem_cache *cachep, void *objp, int node, int page_node) { @@ -767,7 +777,7 @@ static int __cache_free_alien(struct kmem_cache *cach= ep, void *objp, STATS_INC_ACOVERFLOW(cachep); __drain_alien_cache(cachep, ac, page_node, &list); } - ac->entry[ac->avail++] =3D objp; + __free_one(ac, objp); spin_unlock(&alien->lock); slabs_destroy(cachep, &list); } else { @@ -3457,7 +3467,7 @@ void ___cache_free(struct kmem_cache *cachep, void = *objp, } } =20 - ac->entry[ac->avail++] =3D objp; + __free_one(ac, objp); } =20 /** --=20 2.25.1