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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 70ADFC10F27 for ; Mon, 9 Mar 2020 19:04:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3985B227BF for ; Mon, 9 Mar 2020 19:04:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583780668; bh=IV2OCIzL8o/G3c8N0UqNGOhcDLXi0dMFsmrby4Hi70s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=g4VNQpb5jNA2Or96GA4VWxkCUKAoi3zgJ2LSl52zLo9AQAnVNDx53cQeISpYdyh62 jn4Yhm5phEQgGIGhjTbPj7B7I29nniGuT4XSITtpKkETwX1B20E3OspYf0wtp9uFs8 LS/1Q+4OR2nO6OVcMf4JX3BM8B/+IZV9q0dg78w8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727544AbgCITE1 (ORCPT ); Mon, 9 Mar 2020 15:04:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:47648 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727562AbgCITEY (ORCPT ); Mon, 9 Mar 2020 15:04:24 -0400 Received: from paulmck-ThinkPad-P72.home (50-39-105-78.bvtn.or.frontiernet.net [50.39.105.78]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5A1A924655; Mon, 9 Mar 2020 19:04:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583780664; bh=IV2OCIzL8o/G3c8N0UqNGOhcDLXi0dMFsmrby4Hi70s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R/Ut1NOC6if2/wiXN7hYDLDfUS0TApohmXlO51VHLcxC3BBAPdBMlbwTNn+g4HhKm hrau8eiDYjwFCx3uLFZzaFDjQsB1DdC8Atd76ajrSO1OShZcS2IErJgB4/8ad/4GLB ThCuh7dhT6TLrm7+cVHvv3MxSVQNk/nL/svTJcJ8= From: paulmck@kernel.org To: linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, kernel-team@fb.com, mingo@kernel.org Cc: elver@google.com, andreyknvl@google.com, glider@google.com, dvyukov@google.com, cai@lca.pw, boqun.feng@gmail.com, "Paul E . McKenney" Subject: [PATCH kcsan 09/32] iov_iter: Use generic instrumented.h Date: Mon, 9 Mar 2020 12:03:57 -0700 Message-Id: <20200309190420.6100-9-paulmck@kernel.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200309190359.GA5822@paulmck-ThinkPad-P72> References: <20200309190359.GA5822@paulmck-ThinkPad-P72> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marco Elver 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 Signed-off-by: Paul E. McKenney --- 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 fb29c02..614b699 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.9.5