From patchwork Wed Jan 2 17:36:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10746555 Return-Path: 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 440496C5 for ; Wed, 2 Jan 2019 17:36:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 26D1528405 for ; Wed, 2 Jan 2019 17:36:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1A30E28417; Wed, 2 Jan 2019 17:36:21 +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 B51C028405 for ; Wed, 2 Jan 2019 17:36:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 09A128E0033; Wed, 2 Jan 2019 12:36:19 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 04A7D8E0002; Wed, 2 Jan 2019 12:36:19 -0500 (EST) 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 E2EB48E0033; Wed, 2 Jan 2019 12:36:18 -0500 (EST) 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 8801E8E0002 for ; Wed, 2 Jan 2019 12:36:18 -0500 (EST) Received: by mail-wm1-f72.google.com with SMTP id s193so4094491wmd.4 for ; Wed, 02 Jan 2019 09:36:18 -0800 (PST) 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=wqfuZcAjUCBtOLKWkS6SRZq/hte3EYpV7rEPQw3hkz8=; b=dwWP9uMK2yXjYU01ecYSRl0DJAk5vdTy8hrD6OzCydL+XO1BG0exfvrquiB4RBkVQf wnPfP0y5PM0e46r6jFaL3J2es9lTwdpb5iqhHPiIa5Z+GlCSV7nt72H3/GzqNARvJaF/ EzRBw4+FkTbFmvpQw19mgYIwFNxX6Z2xhx1iRMxrRDwMFe2N8rDL5hcb+u4Vx1dATJdN i5Q8ncjeAwDXMBdLvPV/7j8ZSNXJWprTkZJ4st5bBYL+nu07WPwrkEEIVFokTfEyUBuW QZ/mO2w0Uu3zprz2hEuwt/5sGhh9wgnj6hA6bwbm4PpCRnnaycmXAUQ2JB/L5XTqMkiP tJqw== X-Gm-Message-State: AJcUukfD908XTWL3DmYobGyjg7wnQAac1BjNaPRGapTwqUL7kQ52InvO WEIfDDbf2bpfQwLYbOUC0q0Jx18P43/+niTW0BswI9Xvg/kwJTD6MzgzjiT7y+bOshVycjLV2dd 54zM3o+6TAERBsfgs+1Sj3VkuoXnxuUOLpL389G9mvC4BYnbkt/eXiHFY8/OeDbfmNVkhMi0Tfc d04LyBBacT779gZiEgvuoreVztzcpVKYGWm9EqpIqGmbGSI+ONPtofJNUI1MTdKoZ/oiVRnTKzL atCheNt5w34JHo9w084fYydXuwlngq3szbS6q0Zf2B1EoD3QUf9ksIWA6+Q69sZ4iTk2gVfOMe4 nGIt6ld55WCoZetI2CVt6UKbDDqOifXjeOCmaKCgKbipbhGXVX+6CshkWlv0/rxD+t2oz+pOvq1 m X-Received: by 2002:a7b:c7c7:: with SMTP id z7mr38542677wmk.74.1546450577917; Wed, 02 Jan 2019 09:36:17 -0800 (PST) X-Received: by 2002:a7b:c7c7:: with SMTP id z7mr38542654wmk.74.1546450577075; Wed, 02 Jan 2019 09:36:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546450577; cv=none; d=google.com; s=arc-20160816; b=HGgtfPvW2BR4nKmGKz2yfGThJXs6iV+is3VLzBWLfI1L4vN0Yv1gU4hkZuVs5B/qR/ nWz6lUgA8c87QOwCkI/Up1fOxLM7dh4zZkoivkYzQjYmgjE6ILva11vTFRDioIT2rEbv VYWaCCTN1cBUi6/JtWpYJ4akamuCO23bdaf34FgM2rdHXLfJY2HTg9fyx9QZHZrtF5z0 eFhmygwRNDSy/MGbH8HwHxWOFFcb7AhF/H4k/EkTlk3lJFDHPigfMczRlbL0tDKopuQJ wZZH9d9ixw60HjYf4bxnu+/NP3jFTHjDX/uWcmIalFiOu3l76WLpDAYcdv4O58A4w5xx xlcg== 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=wqfuZcAjUCBtOLKWkS6SRZq/hte3EYpV7rEPQw3hkz8=; b=MN35AR1qmCEpVRySLSnzqSVx9F/YV1sjib09tooFxRSzvx5fsCcgYJ0/dTFF4r5TZ+ S4agxZtNBebJrXfUJG7MpT7hxr+7lmse7hQy+CZC9QNzy5stutHpqwnVOF0bQq+OQRle DS9PJexlNTnKEhF8UPhxToAgauvym9UNWNscDoOk7jZbrdN1B98zxDFpJyS9cs/tQKjY f/qOZpq3OQ8EujqQ5SRSv68T4uSPm3THqPeuizuvKM7sYQg4Q0cAMFvCe8yy42nH4ZG9 PLZ1vIRGO7YniJe7g6RfKWWZqb+t6J+jdR46mAntmz55Khv0bPq8kdB0rFMM118+UGfQ 4dDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=GBABedig; 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 201sor25633308wma.0.2019.01.02.09.36.16 for (Google Transport Security); Wed, 02 Jan 2019 09:36:17 -0800 (PST) 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=GBABedig; 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=wqfuZcAjUCBtOLKWkS6SRZq/hte3EYpV7rEPQw3hkz8=; b=GBABedigx8sH5GFwpRqipEDZ14ymhRvEFULjEU8wLa/LptdTisVFf9skUy8ylEKwgj RF12pUwr344Vyvy3ZqJC4iKm1OZSWqoVLD5mJZkl91WIY/lo6o1i2e7+QvZjCRXC8gqD TalGJ7+keqs9g4ydv5W/68JCwOiEcJUrlW170vCsYKVKJdezXyBqilxWlN06NaZHYTDc QQgWpPrpqe6SqK7zrP/HpOaRELc378Wew1Pp2kpkP+K7TKwG3na64p2Wzdh2fIyKQxWR 416+4i3iHDx7qlDktBw/RgIj4tv1H8OekGka2BVVugetEBDgCsmpkgmw/g7V3gWXuDyc OjoQ== X-Google-Smtp-Source: AFSGD/W97uWDkFBwjy9qVKlmOmTQCuBOdfdQInnihelGax0GIIIDp5gYRmDwwP96Pfhda8t/d8RaVw== X-Received: by 2002:a1c:4108:: with SMTP id o8mr34987293wma.91.1546450576552; Wed, 02 Jan 2019 09:36:16 -0800 (PST) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:13:8ce:d7fa:9f4c:492]) by smtp.gmail.com with ESMTPSA id t4sm45987076wrm.6.2019.01.02.09.36.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Jan 2019 09:36:15 -0800 (PST) From: Andrey Konovalov To: Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Catalin Marinas , Will Deacon , Christoph Lameter , Andrew Morton , Mark Rutland , Nick Desaulniers , Marc Zyngier , Dave Martin , Ard Biesheuvel , "Eric W . Biederman" , Ingo Molnar , Paul Lawrence , Geert Uytterhoeven , Arnd Bergmann , "Kirill A . Shutemov" , Greg Kroah-Hartman , Kate Stewart , Mike Rapoport , Vincenzo Frascino , 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 , Evgeniy Stepanov , Lee Smith , Ramana Radhakrishnan , Jacob Bramley , Ruben Ayrapetyan , Jann Horn , Mark Brand , Chintan Pandya , Vishwath Mohan , Andrey Konovalov Subject: [PATCH v2 2/3] kasan: make tag based mode work with CONFIG_HARDENED_USERCOPY Date: Wed, 2 Jan 2019 18:36:07 +0100 Message-Id: <21de3c171438760a232d51cea56792c886bc9160.1546450432.git.andreyknvl@google.com> X-Mailer: git-send-email 2.20.1.415.g653613c723-goog In-Reply-To: References: MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP With CONFIG_HARDENED_USERCOPY enabled __check_heap_object() compares and then subtracts a potentially tagged pointer with a non-tagged address of the page that this pointer belongs to, which leads to unexpected behavior. Untag the pointer in __check_heap_object() before doing any of these operations. Signed-off-by: Andrey Konovalov --- mm/slub.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mm/slub.c b/mm/slub.c index 36c0befeebd8..1e3d0ec4e200 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3846,6 +3846,8 @@ void __check_heap_object(const void *ptr, unsigned long n, struct page *page, unsigned int offset; size_t object_size; + ptr = kasan_reset_tag(ptr); + /* Find object and usable object size. */ s = page->slab_cache;