Message ID | 286fcda449120b643e4665fc9848e81260a1300c.1537383101.git.andreyknvl@google.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B54B7161F for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 19 Sep 2018 18:56:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A608629178 for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 19 Sep 2018 18:56:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9975D2B5EA; Wed, 19 Sep 2018 18:56:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3AEA42AF40 for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 19 Sep 2018 18:56:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 455B08E0013; Wed, 19 Sep 2018 14:55:26 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3E07B8E000A; Wed, 19 Sep 2018 14:55:26 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 258FF8E0013; Wed, 19 Sep 2018 14:55:26 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by kanga.kvack.org (Postfix) with ESMTP id BE0748E000A for <linux-mm@kvack.org>; Wed, 19 Sep 2018 14:55:25 -0400 (EDT) Received: by mail-wm1-f72.google.com with SMTP id x64-v6so5571564wmf.1 for <linux-mm@kvack.org>; Wed, 19 Sep 2018 11:55:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=d1iMb39p1prK7niLwUfLvs3mbBI1WfSY9Tra+BtzAxQ=; b=rpxazf2Do27ePSIGGwecx2rGiMsCRLABW3CbfZN+4JmyKHYmYDWceis4gZZ3xoieBI gqRGPnzUYJco6VXTi6I2W8wD4cJ4SL0EnlWNjtDb+3x4UsetIAD8GQLA0TFRqwQXdrHI rgueg8S/9mfrh9ILgyfqIBOX0siq4TP2QeO3Ct3eQ3vBrGTZ1q+OECNhEbF/eephTNzD pQnhg67grx3b3AGVTrH0V15w1uhFZxJpoPNurMz8Q+6CjtGwXwi250wpcoNG6As8kOmy DWRuqjFk/I/74+La1XQLilmFb/yVyT4AptkW6TW4mUbWFJW9iCKKvp8sSqfbw1YZCTJw LV0g== X-Gm-Message-State: APzg51BAChkNTxN9QicXF/J2fGj76CiVx9A5s+c9ixTeNMGqUKWxrgOh r4oWnEIsOgK4JywdT/ODFwiWPOxkZNxsXXvOSVgfV6EhuXZI1CmbK0EyOVQ9tZ2SO5j0a2kV5bP mf307eIawSgdE0X0yEeKDzqucOlPeRaTFiTwRIJuVp3g5cRQ7A5w83CvdSnNjDeWePMDoz/+Lhx O4YhUjCWcH4fqyu5xBD8q8g4IWY+aAUen72tkzHN7j376v8y8Ye3wmvHgAx5Pa8zRNBPu77JC0n kUNO4TSHDakB3bdg9icz0jFU08HZZoBgffHpS2yauoKS+4EswIfnGrk/2NnREZGJZKF3aRUkVwY M+kgYj7oulqStSJqoaVGGpiIMDuFPCRExuuuYy8K4KrboOvNfJeqrEYIGQFOe2y59QksGEyEJFp A X-Received: by 2002:adf:d20a:: with SMTP id g10-v6mr30875413wri.66.1537383325311; Wed, 19 Sep 2018 11:55:25 -0700 (PDT) X-Received: by 2002:adf:d20a:: with SMTP id g10-v6mr30875387wri.66.1537383324821; Wed, 19 Sep 2018 11:55:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537383324; cv=none; d=google.com; s=arc-20160816; b=LAcKbkqKMD+QQfISG4bkED8r4K+aBHnLNxBPhu+sGlenP0CmfsVeM7KoqTdd3mLcIU wWtbsVMcRL77+kNgi7xE/EuI4+O5mKeTrUM27jNDtCX7/vtc8K0rOdytobhdlyiL4OS0 JP+iXgBIL7KJ/JHKIDDA+NhjW+83DZI864UWWT8Xc8uev3PcAK5aXAD2MFGq5V8gUGjD VVGOMo0KzXR6B/8UyPhgCcqbL+pdOSp6j/MRZ9n7CcFxFstG6qxWFiXVRfVGT/4dXMag BA3eBmBzamigyop5EkeQJLKGyUr3PjzRa+WV772toKVt8ZskJvveuZx5gE+wncfcFej+ aoRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=d1iMb39p1prK7niLwUfLvs3mbBI1WfSY9Tra+BtzAxQ=; b=wuPWMqM/ieITuRUJAitHNdfkpTINoEgXe8M133ksNWhdz8iqA/CEjGB3CoLQKcT4VO eU3KJESfGB/TGcqlAfiRHBrdSAoCbKbBeiDMKxslUN94B+KhumEzr76Tp9cUm4pE0AL5 VWvIWhptFnoCXQ8qONTnwqWStvl8RfFoukG0M0Jf1LmN2OpvsvN0BUO0dKnFgw2mLpqj R9V8GS8XjchF26YIh5taISCDY67JCDIXsrUc649U1FYd56JKuiaYD57E5FS5wMA5Oiar dblS6DQRbewXOl2aIsNsmJ8l8cX0tl8zc+cQp3VBRaAEte0ZTx6eOejrex2swFOabKLa VuHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=op++z0BS; spf=pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=andreyknvl@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id w14-v6sor16161308wrr.11.2018.09.19.11.55.24 for <linux-mm@kvack.org> (Google Transport Security); Wed, 19 Sep 2018 11:55:24 -0700 (PDT) Received-SPF: pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=op++z0BS; spf=pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=andreyknvl@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d1iMb39p1prK7niLwUfLvs3mbBI1WfSY9Tra+BtzAxQ=; b=op++z0BSZ/nwOadd89i0fho9uQZiZsdFy7N0GRCwHUqVvYMaWvDvVmYOPZbERPOPFx ad23W/MQBbvV3/GY7+tuqP2Of9HHtQ5OTJHZQdRaqHLIIauiwl5p5TPXuZcuLja8f+lg Gmg1pZr0oyuUyf5jFx3yO97RBema8RQDjlge5Vi/p9u6ZVJyeu/Q/b8sZe3wIn46oBTL 72/Sm5BUPocqr3OOPUjJ579q43JT4k5eYih4kkSQdo03+dbtwIDYkx5ncimrVvHA8k4o PG200V3W+tgEQO46uTpx3RAKoZvVLrCxJ5EK6vEUn1RxqZyP4JQ2BP9MlWsfD2UEcjEy JKhw== X-Google-Smtp-Source: ANB0Vdb5o820qjCsQHYsVlC6o405PmMuMtbuK7P7pWLgWe20tanCx9P4Y5oo2MG9QevgZjPd50wONQ== X-Received: by 2002:a05:6000:10d0:: with SMTP id b16mr30374902wrx.226.1537383324464; Wed, 19 Sep 2018 11:55:24 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id b10-v6sm8510065wmc.28.2018.09.19.11.55.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Sep 2018 11:55:23 -0700 (PDT) From: Andrey Konovalov <andreyknvl@google.com> To: Andrey Ryabinin <aryabinin@virtuozzo.com>, Alexander Potapenko <glider@google.com>, Dmitry Vyukov <dvyukov@google.com>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Christoph Lameter <cl@linux.com>, Andrew Morton <akpm@linux-foundation.org>, Mark Rutland <mark.rutland@arm.com>, Nick Desaulniers <ndesaulniers@google.com>, Marc Zyngier <marc.zyngier@arm.com>, Dave Martin <dave.martin@arm.com>, Ard Biesheuvel <ard.biesheuvel@linaro.org>, "Eric W . Biederman" <ebiederm@xmission.com>, Ingo Molnar <mingo@kernel.org>, Paul Lawrence <paullawrence@google.com>, Geert Uytterhoeven <geert@linux-m68k.org>, Arnd Bergmann <arnd@arndb.de>, "Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Kate Stewart <kstewart@linuxfoundation.org>, Mike Rapoport <rppt@linux.vnet.ibm.com>, kasan-dev@googlegroups.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sparse@vger.kernel.org, linux-mm@kvack.org, linux-kbuild@vger.kernel.org Cc: Kostya Serebryany <kcc@google.com>, Evgeniy Stepanov <eugenis@google.com>, Lee Smith <Lee.Smith@arm.com>, Ramana Radhakrishnan <Ramana.Radhakrishnan@arm.com>, Jacob Bramley <Jacob.Bramley@arm.com>, Ruben Ayrapetyan <Ruben.Ayrapetyan@arm.com>, Jann Horn <jannh@google.com>, Mark Brand <markbrand@google.com>, Chintan Pandya <cpandya@codeaurora.org>, Vishwath Mohan <vishwath@google.com>, Andrey Konovalov <andreyknvl@google.com> Subject: [PATCH v8 13/20] kasan, mm: perform untagged pointers comparison in krealloc Date: Wed, 19 Sep 2018 20:54:52 +0200 Message-Id: <286fcda449120b643e4665fc9848e81260a1300c.1537383101.git.andreyknvl@google.com> X-Mailer: git-send-email 2.19.0.397.gdd90340f6a-goog In-Reply-To: <cover.1537383101.git.andreyknvl@google.com> References: <cover.1537383101.git.andreyknvl@google.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: <linux-mm.kvack.org> X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
kasan: add software tag-based mode for arm64
|
expand
|
diff --git a/mm/slab_common.c b/mm/slab_common.c index 3abfa0f86118..221c1be3f45f 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -1513,7 +1513,7 @@ void *krealloc(const void *p, size_t new_size, gfp_t flags) } ret = __do_krealloc(p, new_size, flags); - if (ret && p != ret) + if (ret && kasan_reset_tag(p) != kasan_reset_tag(ret)) kfree(p); return ret;
The krealloc function checks where the same buffer was reused or a new one allocated by comparing kernel pointers. Tag-based KASAN changes memory tag on the krealloc'ed chunk of memory and therefore also changes the pointer tag of the returned pointer. Therefore we need to perform comparison on untagged (with tags reset) pointers to check whether it's the same memory region or not. Signed-off-by: Andrey Konovalov <andreyknvl@google.com> --- mm/slab_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)