From patchwork Thu Nov 5 00:02:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11883125 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 EFB14C00A89 for ; Thu, 5 Nov 2020 04:25:23 +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 84AB920795 for ; Thu, 5 Nov 2020 04:25:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="soqVr30i"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="MjHqa6Wv"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="EIGseFkU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 84AB920795 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=yiHYbBi5ldB5gJydRqD8Xiuffx/oFxU4Gy0nuajN15w=; b=soqVr30iQwK7v0lQh+hqXXdit s/yMa5sswYeShIj0KIUu5a5Goh9tKbIRhmvd5OGwEtpwbKl/tcbPVAeKxZFx+Os1VFe0237SZL6/7 kvwQ5MckRHr9gl+zlizZ63uRClfjjaI/hxoZAaayfvgH5j5vEcUAAWKGZXrYj9TqlxrOY2dZYeYeC wQtSa0EaCQQm0JnZYTqYwe6dzD0L+OMs9WBwpLw9siBr8V+XMg4MCPgey0684o59Wux7Dh+UShuCl wcQTjXKOAWibOuLifhojZp7tse039OZXFyF0E/NxFAIzVwdcIUs+enyV7gs75xYn0WNbGRWKgfMz3 wnaKuK60g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaWoL-0006fs-Go; Thu, 05 Nov 2020 04:23:45 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaW3s-000145-Ud for linux-arm-kernel@merlin.infradead.org; Thu, 05 Nov 2020 03:35:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:Cc:To:From:Subject: References:Mime-Version:Message-Id:In-Reply-To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=JW8D6ibToVOb7LpAkCihsputAW6li7gT66iFpWFJlB0=; b=MjHqa6Wv8TOxj9HyXjWTfBVxjV 1ShMDTfMZoxor5EUIXathH0c1PWXlXt/QaJTCRXrzT9uRSWg5LVzM+/p+I1p+QeXhRZZM2GnM5YWP XFWA3cK0s7sn6Nym6Yz560b6EZHeIOmmhlBZHpd4ZG8ewjQrgst13cPHot0OJ/xp59E4hDc9C2bGz hpESCSIYWYwzGuccHm5AxKzqrsoOrm7TLqGVv798kpNHq6zSPlST5zK8B82L5elnnakcjTVzSIc9s e1t+NwowAeotEuiKnFUrC5dLAuNJtpE6LeXzs79hFwqaIpoj3dqloi2fwqPrjlKEvQ50L0ZCt37DB cXdGZ2Eg==; Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by casper.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaSkq-0000ot-5C for linux-arm-kernel@lists.infradead.org; Thu, 05 Nov 2020 00:03:54 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id y11so452975ybm.22 for ; Wed, 04 Nov 2020 16:03:51 -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=JW8D6ibToVOb7LpAkCihsputAW6li7gT66iFpWFJlB0=; b=EIGseFkUbu4j97m+Rhe8ifiJEJ0/vSgBaoaF2oPB6YJuPwOq2yFl8o3MdZTisWpG8v 7KPp5oAaiwsPmjeCUi37l89Z7cZJJj/hhe5YwAUSX9ohPHFQHG9rviik167v9qNGYxg+ P0LNwwi8goSo5pXkQCm2SaSogyReaDgIOTbI5K97sZj9flQ0v+LrD0Pth2BoTDM0Nawq hRM42A6VpyD9FTb4ipeHNtA1FxJV0NecpqgkotIXjwA3kZts685NAweHbMSnkr4kQD/y wrASYwOEExzSGG5j537dCqcaS992EojrvnZ4VEjnIXPSewtClP3KbuoKPCc76tmqA1U1 kE1w== 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=JW8D6ibToVOb7LpAkCihsputAW6li7gT66iFpWFJlB0=; b=AZQvwNdAjdADJGfBUhHHficavg3AuJo8VVqWRgRRVyMumHSXqBp3q8BwmrgXiu+8r6 1ggECxJsuPUoIF1ADgpHpMnK9scFA4IhGBloOQMNMyE+eKEkMfI9c8MaMd16C3NcEnFX +3QWs96KT+ASLGfGMTvBt4uKBst8dx3QQs/MddW+v/l/n1WvHOUuEu6U5blyPRoAOtUb 72GcY12nFI0U8UIP6nSlLt1YICr0BYgP5ewEQoDcK6QMBAwcCCFmndlRMOCWYkzPf041 t+yY28Q3NP1yJpqfynpPvOXoNlX2WN7SLMS2mDlM1W3aEEofIsqbsWsC6EpuGBHvbVIJ wBjA== X-Gm-Message-State: AOAM532wrqOvRGO9YIv8zfMkcMFDbUL2fneuZyV/2Hp87HZ1azhoSlK9 a1ZvDUTmYBGeciHIfSdzwQNeE6Z8VEr4HBig X-Google-Smtp-Source: ABdhPJyMEsriifNDEGfN+BopmjlIR9t9CjJFRB97WqiYs1BD5RFz7wmlp/gc3XkSEP7qscjhGorWWs7vzkyRjDGQ X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a25:48c:: with SMTP id 134mr48783ybe.158.1604534569629; Wed, 04 Nov 2020 16:02:49 -0800 (PST) Date: Thu, 5 Nov 2020 01:02:16 +0100 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.1.341.ge80a0c044ae-goog Subject: [PATCH 06/20] kasan: remove __kasan_unpoison_stack From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201105_000352_468989_9FF396B0 X-CRM114-Status: GOOD ( 11.87 ) 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: Branislav Rankov , Andrey Konovalov , Kevin Brodsky , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, Andrey Ryabinin , Andrew Morton , Evgenii Stepanov 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 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 a3e67d49b893..9008fc6b0810 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -59,18 +59,12 @@ void kasan_disable_current(void) #endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ #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; - - kasan_unpoison_memory(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); + + kasan_unpoison_memory(base, THREAD_SIZE); } /* Unpoison the stack for the current task beyond a watermark sp value. */