From patchwork Fri Nov 13 22:19:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11905127 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=-12.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,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 A41E6C4742C for ; Fri, 13 Nov 2020 23:52:05 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 44E1A20791 for ; Fri, 13 Nov 2020 23:52:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Z9oW6CkF"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="Mr40u2Na" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 44E1A20791 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version:Message-Id: In-Reply-To:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=e8xNoxiSyZlmOHPD/PovpRgo//kCnFff/iG5T0GsZWY=; b=Z9oW6CkFk2JxZSDG4oiFoe2Pn wDWivMrzZnGvNmxujjOOtotu/28wHsvOdexplpOx/IfQYaXMK2gSLRrn1Y2aFP9eJoPvDdPTScWVQ JCW8+Y9vUGw49jNZ0DkZrP2sWjibVzH2LUUgtjutreDyZwryKaPlfmSaRMwoItQHlHBF6EzNc5Wde e9VxS5lFkUi8GwFBSRzkT6tn0xF6BCwdV+44Q68snolG38JipmoFCKzhrz80ygVcrIkaA0CAK2yv3 Z/Y5DJkZV7oSRhv0lnNwW5bWvjJFyyE+bf3UEBsDcp5oG+Y+4Dqy1cQOdKMeke5OZ8TNZzCpUynPp zZE/tfsUA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kdiqd-0002yu-RY; Fri, 13 Nov 2020 23:51:19 +0000 Received: from mail-qt1-x84a.google.com ([2607:f8b0:4864:20::84a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kdhQr-0001WU-Rt for linux-arm-kernel@lists.infradead.org; Fri, 13 Nov 2020 22:20:40 +0000 Received: by mail-qt1-x84a.google.com with SMTP id i14so6597752qtq.18 for ; Fri, 13 Nov 2020 14:20:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=Jsr+yOOqZi2Nj6qjC5GqIPggpAtw8z6+rbSLs9IYMt8=; b=Mr40u2Na+744Lu2xB5XH5N7NJUu5zkCz5bvYutyv8bprHVKibdWrcZ08RTuHeheEFy 9jmFVE9u4pMUBRSsH8duKKAxLckAMS81HXO4Xd+IF5ViTs3z+IiCHYitEFwvlrygLVdl Fp1Iu8qVyEn4/oBWnVHCDlVMIVq/wT8DxVhflITdtyJe4/pBd2b+AM+ccSDdOjDiwdhT xJhX33OueoxZPgKqC96ik1I2rYb4dt4KvgmOopH5k0UnP/KslDnr1Hsw0cCUNHD6tkYZ pie5A+DraMOwWtJRPgmHqz7/llq9yX68G1qf4bknJXWyJ3BKIpXkFHmhJnfNhv7ht2kH CfAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=Jsr+yOOqZi2Nj6qjC5GqIPggpAtw8z6+rbSLs9IYMt8=; b=qK/vrnaXrCPPJjNUcnRaAssBefNW9Ca3b8PE5PXru8wq4ap+WQWUidyEAZ7MSl+sW2 lzukQEWrk/TD5EsGTqC1I2oghKYjHv6dYy1LRlWQcZLkZSyoSsdqZcrqSOglcNKvldh/ 7N3txUWUCOHqIaop8ELars+i23TmuUiAuPCYR/1lb9e6N6jZKf1xzuAEXH0pB9YPJA1b YHcHrWAeXO0vYPGdtM93KY5VrVvLrKkNwl865PcStzMblLyledStDMAM1eyZM6wC+0ew MoFVDmWjqcKllWT0YrTLo2M7aLFzQwDeN6IbEzhEbk3dJiYrX+iSfw8BNxXMfvAbsIuJ aVyQ== X-Gm-Message-State: AOAM533Ls3hxeiCIVBioU6/NZ4cx8QbyLPhlokEvKfzbFF0VYWnrM+Pt FRlSs6nnwQxOpoY2AVChkVIiD8J4dP1HzcvX X-Google-Smtp-Source: ABdhPJwVIBicKScDqVn4tuFRRg0l3bRUAKZbS6vROY4eFdr5r/DaOJjnoyZljU2l4klUlopSKmUGVNXS2wDcCsNI X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:ad4:4633:: with SMTP id x19mr4837837qvv.11.1605306029294; Fri, 13 Nov 2020 14:20:29 -0800 (PST) Date: Fri, 13 Nov 2020 23:19:56 +0100 In-Reply-To: Message-Id: <157e9dfe43c5612ab028638c39ed5774b613449d.1605305978.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.299.gdc1121823c-goog Subject: [PATCH mm v3 06/19] kasan: remove __kasan_unpoison_stack From: Andrey Konovalov To: Andrew Morton X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201113_172038_506064_1DC88C55 X-CRM114-Status: GOOD ( 12.40 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Marco Elver , Catalin Marinas , Kevin Brodsky , Will Deacon , Branislav Rankov , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexander Potapenko , Evgenii Stepanov , Andrey Konovalov , Andrey Ryabinin , Vincenzo Frascino , Dmitry Vyukov Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org There's no need for __kasan_unpoison_stack() helper, as it's only currently used in a single place. Removing it also removes unneeded arithmetic. No functional changes. Signed-off-by: Andrey Konovalov Reviewed-by: Dmitry Vyukov Reviewed-by: Marco Elver Link: https://linux-review.googlesource.com/id/Ie5ba549d445292fe629b4a96735e4034957bcc50 --- mm/kasan/common.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 7648a2452a01..fabd843eff3d 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -65,18 +65,12 @@ void kasan_unpoison_range(const void *address, size_t size) } #if CONFIG_KASAN_STACK -static void __kasan_unpoison_stack(struct task_struct *task, const void *sp) -{ - void *base = task_stack_page(task); - size_t size = sp - base; - - unpoison_range(base, size); -} - /* Unpoison the entire stack for a task. */ void kasan_unpoison_task_stack(struct task_struct *task) { - __kasan_unpoison_stack(task, task_stack_page(task) + THREAD_SIZE); + void *base = task_stack_page(task); + + unpoison_range(base, THREAD_SIZE); } /* Unpoison the stack for the current task beyond a watermark sp value. */