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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 B9756C43381 for ; Wed, 13 Mar 2019 19:17:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8CFF9213A2 for ; Wed, 13 Mar 2019 19:17:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552504658; bh=HUMTtwvfTqJ22EdxNG0wvhC1euHrxFtWHrrrAVFLCUM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sEze0TVYZLNaCIgYrvk4ib+/UpVWMDB6UZ+I5KPxZcKkTlFOCbDbKbtqaZ0nllc5e iXHQv71h/EYqV1ajvcRfmrN7NUCOM1hcyjaumg4Vu7JAM0KD3UYL5L7cLlKhkT5ZUy 5jwBZuibjUprmSxRfDKJchLkEuK5N/aV/D6LGtlg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728915AbfCMTRh (ORCPT ); Wed, 13 Mar 2019 15:17:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:48006 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727818AbfCMTRf (ORCPT ); Wed, 13 Mar 2019 15:17:35 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BA963213A2; Wed, 13 Mar 2019 19:17:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552504654; bh=HUMTtwvfTqJ22EdxNG0wvhC1euHrxFtWHrrrAVFLCUM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oIMmuhhGfSCg3rqpjx0dPbnQ/OZmG6p+ELNpxYy9AZcjMAefIlkR6Nt+GkxunvdoV L1V3/Vku9ntYPViiJlXWBfYEHngJMh/yqhVUOBfiTdPIhLqZEePyTL2Kz4fu+qlzdo tNwqsAk+0vreAglCoIabl+OhnbbUsFn46h16oiVw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andrey Konovalov , Alexander Potapenko , Andrey Ryabinin , Catalin Marinas , Dmitry Vyukov , Evgeniy Stepanov , Kostya Serebryany , Vincenzo Frascino , Andrew Morton , Linus Torvalds , Sasha Levin , linux-mm@kvack.org Subject: [PATCH AUTOSEL 4.9 15/24] kasan, slab: make freelist stored without tags Date: Wed, 13 Mar 2019 15:16:38 -0400 Message-Id: <20190313191647.160171-15-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190313191647.160171-1-sashal@kernel.org> References: <20190313191647.160171-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrey Konovalov [ Upstream commit 51dedad06b5f6c3eea7ec1069631b1ef7796912a ] Similarly to "kasan, slub: move kasan_poison_slab hook before page_address", move kasan_poison_slab() before alloc_slabmgmt(), which calls page_address(), to make page_address() return value to be non-tagged. This, combined with calling kasan_reset_tag() for off-slab slab management object, leads to freelist being stored non-tagged. Link: http://lkml.kernel.org/r/dfb53b44a4d00de3879a05a9f04c1f55e584f7a1.1550602886.git.andreyknvl@google.com Signed-off-by: Andrey Konovalov Tested-by: Qian Cai Cc: Alexander Potapenko Cc: Andrey Ryabinin Cc: Catalin Marinas Cc: Dmitry Vyukov Cc: Evgeniy Stepanov Cc: Kostya Serebryany Cc: Vincenzo Frascino Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- mm/slab.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mm/slab.c b/mm/slab.c index b30b58de793b..cb1f38e72b4e 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -2405,6 +2405,7 @@ static void *alloc_slabmgmt(struct kmem_cache *cachep, /* Slab management obj is off-slab. */ freelist = kmem_cache_alloc_node(cachep->freelist_cache, local_flags, nodeid); + freelist = kasan_reset_tag(freelist); if (!freelist) return NULL; } else { @@ -2717,6 +2718,13 @@ static struct page *cache_grow_begin(struct kmem_cache *cachep, offset *= cachep->colour_off; + /* + * Call kasan_poison_slab() before calling alloc_slabmgmt(), so + * page_address() in the latter returns a non-tagged pointer, + * as it should be for slab pages. + */ + kasan_poison_slab(page); + /* Get slab management. */ freelist = alloc_slabmgmt(cachep, page, offset, local_flags & ~GFP_CONSTRAINT_MASK, page_node); @@ -2725,7 +2733,6 @@ static struct page *cache_grow_begin(struct kmem_cache *cachep, slab_map_pages(cachep, page, freelist); - kasan_poison_slab(page); cache_init_objs(cachep, page); if (gfpflags_allow_blocking(local_flags)) -- 2.19.1