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=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 A919DC64E7C for ; Mon, 23 Nov 2020 20:15:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5ACA120715 for ; Mon, 23 Nov 2020 20:15:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="mg4G1Did" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732631AbgKWUPN (ORCPT ); Mon, 23 Nov 2020 15:15:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43378 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731687AbgKWUPJ (ORCPT ); Mon, 23 Nov 2020 15:15:09 -0500 Received: from mail-wr1-x44a.google.com (mail-wr1-x44a.google.com [IPv6:2a00:1450:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB403C0613CF for ; Mon, 23 Nov 2020 12:15:08 -0800 (PST) Received: by mail-wr1-x44a.google.com with SMTP id h13so6189857wrr.7 for ; Mon, 23 Nov 2020 12:15:08 -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=p36dbwqSBkDo+5S2cwk7w2vFpTiM3nymWvjDRmhBFUI=; b=mg4G1DidJDofLGHNEBS3YNNpngVUCVymP5RWXDDdw2uRs9rVTEIaudcIuGM5F2q3L6 9Z/syptAsR65gevgGC7vb22jdpSpm8g2/OW2ZOv1TZ8ZvhRbz+eCh8+IZlSsYvvoSEaY KmtODUBNRhwsiEkBrfxHvAbyW7zWsjL/jwTAXPHFYAnzD1KOcF2q0gADTK7rF9nFZ+jO eOckU8kstaGbsmTJEnIYdXYtBuw6W4CSugEN2FyQtnaWvOQo7rNh2FHuR2TdgNawAkcz Xd/a751+eSOv37jt6hmeRkX2yJmLePmHNofrgvw4sRG3ClS9Zjoqb5Og50/dgojj1XOP Mbtw== 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=p36dbwqSBkDo+5S2cwk7w2vFpTiM3nymWvjDRmhBFUI=; b=V5rpZfZfso7EDrxMEZMoeEbVxBvDQW73IrWRWYHglwETOLz99ai7UKNMw6jahB4INS xNbn0kDj55ex9UD1z88jHyGk0qhnGNc+xQP7cWrYtpB2m3TKbA3BU2DDrtMgwq+Jx9Uy 6ownMz/1NbI3wLCIPVTIh3cFr6z7fLO9dblHGZjWVxOVIuCtyizbZf9il691AyOu4DWF VVr54leeprbWkKW2z5wPY3a2ee0dfrkM11Ae4JDqqiiAF322MeVhBe3liXwq74mH5oxC AR/oNt7cUEc1sgb12XNzGpZlUeE+MyU29LjahDleP6zIEnIBdpN/QoYMNECQhRtPmyLN GUjQ== X-Gm-Message-State: AOAM533USvczi5QknecEwQODfBOpL07UZFZgYCRQC3BN0HdY7WQVlI5a vmjFwN5cAjkbu0MfeCvZA2jR+G/9zOJDDUQf X-Google-Smtp-Source: ABdhPJx/wpDE4yzZ0h+S0RGgypb3BniYNtoFo8y6Vex4DrXhWizpWxJCeQcvoYWSbeyWzTWTt6szgogxteJ0R7Gh Sender: "andreyknvl via sendgmr" X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a1c:9d4c:: with SMTP id g73mr17209wme.127.1606162507547; Mon, 23 Nov 2020 12:15:07 -0800 (PST) Date: Mon, 23 Nov 2020 21:14:36 +0100 In-Reply-To: Message-Id: <93e78948704a42ea92f6248ff8a725613d721161.1606162397.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.454.gaff20da3a2-goog Subject: [PATCH mm v4 06/19] kasan: remove __kasan_unpoison_stack From: Andrey Konovalov To: Andrew Morton Cc: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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. */ -- 2.29.2.454.gaff20da3a2-goog