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=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL 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 3D8C4C2D0CE for ; Tue, 21 Jan 2020 16:05:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 144F024654 for ; Tue, 21 Jan 2020 16:05:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="BBeNCO/V" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729537AbgAUQFi (ORCPT ); Tue, 21 Jan 2020 11:05:38 -0500 Received: from mail-wm1-f74.google.com ([209.85.128.74]:51392 "EHLO mail-wm1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727817AbgAUQFh (ORCPT ); Tue, 21 Jan 2020 11:05:37 -0500 Received: by mail-wm1-f74.google.com with SMTP id n17so527450wmk.1 for ; Tue, 21 Jan 2020 08:05:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=Elct5+lKhC9X7zT8nF9IWixwmqUVlFcvw9suDwdwDnE=; b=BBeNCO/VePLcTSLzcCCeGgXVEkSWlMwTu3VbXvcGfhP1iPUsbRj5KE87tzjUQN40gL qtcdybbE++t9eKqYrrZWmKpyQMxtWRYUW9igsu7VTcyQVTrKfmvNkcGXC9rGR+ngubcL fxwrGSmifI0FAwTwskPPs6jeSV3KUkdmEiNO/kcqwe1mI/W+4vFVTqZpVs7+4OCSxdaP 0jcEdTQYzAyCAU6gAP4dogHCCMkX93XgLOl/6ZUeQGgMUQly3r5uStCuZFK1ONTR/Ant GUGtmCUqytt+ikLWZGbPo4raVo0CxNDZT/VPf4QDfZSatR7VYZ75efKSQnNqvV/nfIji 4CHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=Elct5+lKhC9X7zT8nF9IWixwmqUVlFcvw9suDwdwDnE=; b=SuQ15O9KXYY8cVbNvKzu4TjMA2mOw0KWxPEC7hqb07oMcGQD4EyyUrRW2HNhprRZv9 R3wjmF7/ENld4isJhG9CwqbQ1Y6xGGN9/RGgySTozX6cTr/MquoAeLSPlGNwf7PqMDJT iW6GkvGQj1Y41c93SzxKt3iLvbFWl7oLlPkytqMm10wBPSIW1J7GaCXgCpACUW6x+Zl4 hD4tUi7tyAcvlJ+fLss3TnTPukNiOvsVLjZZOhmU9uHecQaDy3vKSJAq/PmDzHVmN+7Z 1k2qmCVujr7d4+wbPVdu9h4PEyyDDfX+MFc+u55KHbYJs5cv0XTTP+iysFBmUzgPkZAN w2gg== X-Gm-Message-State: APjAAAWn9XTcCmtnnthzJhA21SW9GYNogiVzl3BgbrNjh9zRd2qh/sF/ yAIh226nEEZoMh9U72i0bE1TOd7mjg== X-Google-Smtp-Source: APXvYqwi0h8m0qrPFFmbHFrsPfWgG1hho+4RJvofexg3tlhh4RJCdi83g9YTl/d38pRcvILCYcFUDlObMA== X-Received: by 2002:a05:6000:11c5:: with SMTP id i5mr6021320wrx.102.1579622735534; Tue, 21 Jan 2020 08:05:35 -0800 (PST) Date: Tue, 21 Jan 2020 17:05:11 +0100 In-Reply-To: <20200121160512.70887-1-elver@google.com> Message-Id: <20200121160512.70887-4-elver@google.com> Mime-Version: 1.0 References: <20200121160512.70887-1-elver@google.com> X-Mailer: git-send-email 2.25.0.341.g760bfbb309-goog Subject: [PATCH v2 4/5] iov_iter: Use generic instrumented.h From: Marco Elver To: elver@google.com Cc: paulmck@kernel.org, andreyknvl@google.com, glider@google.com, dvyukov@google.com, kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, mark.rutland@arm.com, will@kernel.org, peterz@infradead.org, boqun.feng@gmail.com, arnd@arndb.de, viro@zeniv.linux.org.uk, dja@axtens.net, christophe.leroy@c-s.fr, mpe@ellerman.id.au, mhiramat@kernel.org, rostedt@goodmis.org, mingo@kernel.org, christian.brauner@ubuntu.com, daniel@iogearbox.net, keescook@chromium.org, cyphar@cyphar.com, linux-arch@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This replaces the kasan instrumentation with generic instrumentation, implicitly adding KCSAN instrumentation support. For KASAN no functional change is intended. Suggested-by: Arnd Bergmann Signed-off-by: Marco Elver --- v2: * Use updated instrumented.h, removing post-hooks for user-copies. --- lib/iov_iter.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/iov_iter.c b/lib/iov_iter.c index fb29c02c6a3c..614b6999d2da 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -8,6 +8,7 @@ #include #include #include +#include #define PIPE_PARANOIA /* for now */ @@ -138,7 +139,7 @@ static int copyout(void __user *to, const void *from, size_t n) { if (access_ok(to, n)) { - kasan_check_read(from, n); + instrument_copy_to_user(to, from, n); n = raw_copy_to_user(to, from, n); } return n; @@ -147,7 +148,7 @@ static int copyout(void __user *to, const void *from, size_t n) static int copyin(void *to, const void __user *from, size_t n) { if (access_ok(from, n)) { - kasan_check_write(to, n); + instrument_copy_from_user(to, from, n); n = raw_copy_from_user(to, from, n); } return n; @@ -639,7 +640,7 @@ EXPORT_SYMBOL(_copy_to_iter); static int copyout_mcsafe(void __user *to, const void *from, size_t n) { if (access_ok(to, n)) { - kasan_check_read(from, n); + instrument_copy_to_user(to, from, n); n = copy_to_user_mcsafe((__force void *) to, from, n); } return n; -- 2.25.0.341.g760bfbb309-goog