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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 158FACF9C6F for ; Mon, 23 Sep 2024 06:09:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4C3936B007B; Mon, 23 Sep 2024 02:09:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 474976B0083; Mon, 23 Sep 2024 02:09:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 33B136B0085; Mon, 23 Sep 2024 02:09:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 15CF46B007B for ; Mon, 23 Sep 2024 02:09:03 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id C9034121095 for ; Mon, 23 Sep 2024 06:09:02 +0000 (UTC) X-FDA: 82594974924.18.257EF8A Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) by imf19.hostedemail.com (Postfix) with ESMTP id DB5841A0011 for ; Mon, 23 Sep 2024 06:09:00 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=hw2NE5ed; spf=pass (imf19.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.208.174 as permitted sender) smtp.mailfrom=snovitoll@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1727071585; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=K40eclvjg+5GlWGh4SlN0FjtX41ZWIpAlF1jWels5qA=; b=nlGCrdzGJugn6WF31qXecdi2y7yAxOiN16JIDMySS2EyuYgWsAVv4dvWS1LQB2gmX68/3P JyEocx89vFvVB0H++GnkaPu9upkNpVHx1b/QQbeg6fpiCq/9b26VreizAiO9E5Ygg4PSUn JnBelMZ0gK+fdlcg4iNol10Y5yU4UqE= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=hw2NE5ed; spf=pass (imf19.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.208.174 as permitted sender) smtp.mailfrom=snovitoll@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1727071585; a=rsa-sha256; cv=none; b=R+64Q2l3TygB2HfavVnqaO9jfX3CLwme3A8iK+/8qhmCKY+EDGnyLLYyqmB4tSezhWgBCM pC5b+eWWK9PuKiVJbraDjRqQWwfvGwKspgN4FclzEj6Dhzk9RdKOi8fXTl2pOqm/L5y1Sf m7uNtUzM/LNcpBJoI9obKlIAW6LNxQ8= Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-2f75f116d11so36293881fa.1 for ; Sun, 22 Sep 2024 23:09:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727071739; x=1727676539; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=K40eclvjg+5GlWGh4SlN0FjtX41ZWIpAlF1jWels5qA=; b=hw2NE5edmJVefUdj1SdEeA1bG2tu76I7SwecwlgKuG/CMf4m5s74jKirwgSplk9YON Fl7AknnUFMjwzvH/IRHhMmqqQF3nWjgp3D9J4B+Sws1UT4YGKFL4vH2Z/8I8nVxtq3ub vuTrVDxe0Wqm0u17oVqb8aq3gU8iojUHTw0xiJmy7ci6o1kgl8ZVgoiNzSt6Vzzlx5zv +SZbtzQfuf/+47FYxZPagSclo11zVEhdKjfD39hcs1A5Z3cjPYyiZ3p6/2rt4SsFCMSl Jq7DACRWwTBd48e+2ZeqT4XvnDBSEPpNjdC2uQLm4DTWAnVAlNrvoeVTYXyf43kq9h2k Yrpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727071739; x=1727676539; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=K40eclvjg+5GlWGh4SlN0FjtX41ZWIpAlF1jWels5qA=; b=rlc73E5bA/BomcmSsR5WSamCvG7S+mIX0xTgStv8cxUSDRAflg0YGlV3EBjcHm2oNn ONDrpCHcb/0qHpi2E9s/sUTQm2eZbFazwLvteViw90vuDcZHhVG1xv00ofrvefsenbmt EJn9HpnUBXe7ZSslLs4kVpB112l6oaCzQOlZYiEZ9l+jwIuQH7IjAiPKCCeM9wfzeJRF 0oOCqQtWZ4NQnKlO6BuHpVpWQcPrF3T80UYs7vWE+p/lePzUfLxj7ILPSpLmxyulna/5 7FCKDd3zpSe1lO1HKXhRSFaIGSujuyXI0+e8SziWpC0EfT8W6V9w2Fb/VqMEBWZUGYzt yZMQ== X-Forwarded-Encrypted: i=1; AJvYcCU+ZKMd11VDt7pR0vWm9mfuq4dB23DSNR11Py6RJ4AOwJNAyHAl6TkZVevTWcIXWDVAfkOojqvyyw==@kvack.org X-Gm-Message-State: AOJu0YxY/+mnefK75A1Qe3RhgA2qJ04TFLxAT2+PVMwcIi2WXmxP6NIo 9mrw16Bj139ScppwXG+9KQ/hkmSSQCRQi/77rV5q7nRnl6cx1vWTolT/iuLiIGlKmcDbnJi6Ncd xOCG3xgVdKFpyP/sjy6Wj2VhY7fI= X-Google-Smtp-Source: AGHT+IHXZ8/KhRf9j+/7bXZhnnPZaQ3XwlgnSVJMxl6mx6N/2HFk7xuLnrJ2w7P0CyX1LdgbhickwQtJDiqfe5YAXHQ= X-Received: by 2002:a05:6512:a8f:b0:536:a4da:8d86 with SMTP id 2adb3069b0e04-536ac2e0382mr4432965e87.15.1727071738642; Sun, 22 Sep 2024 23:08:58 -0700 (PDT) MIME-Version: 1.0 References: <20240922145757.986887-1-snovitoll@gmail.com> In-Reply-To: <20240922145757.986887-1-snovitoll@gmail.com> From: Sabyrzhan Tasbolatov Date: Mon, 23 Sep 2024 11:09:33 +0500 Message-ID: Subject: Re: [PATCH v5] mm: x86: instrument __get/__put_kernel_nofault To: andreyknvl@gmail.com Cc: akpm@linux-foundation.org, bp@alien8.de, brauner@kernel.org, dave.hansen@linux.intel.com, dhowells@redhat.com, dvyukov@google.com, glider@google.com, hpa@zytor.com, kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, mingo@redhat.com, ryabinin.a.a@gmail.com, tglx@linutronix.de, vincenzo.frascino@arm.com, x86@kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: DB5841A0011 X-Stat-Signature: utsgb3eigp6976c5q1sfr475u7kgc93r X-Rspam-User: X-HE-Tag: 1727071740-875171 X-HE-Meta: U2FsdGVkX1+Pyd5u6LH6X+T+DRNNaOy2B0HEjH56DCs7extKlJRGCAUnY8fyWEkTaNZ281GkwbvWu4IWH2Lg8+dvWQQVUsN4G6YPPFefDIOLNq6Q/JsxAcjTVWkDSmvS+BREPTYrKIAO0RSHsxqjU70DFdVSGgE5Lu/oJexSGuf1HSFdznJKwBRe4yNMiDJAzxfOc4cwBnFqlXPJH15HZHA2BG3WRRjZ6EmAGLjQCiOHSNxuc6PWxD2D6rXxo8DLp/2BBirSZYw3zqI3hXlgLOEh1KgFnCrv4P0DLnHOl3SeP5UG6DdZ9VOGM4mnZXGAXSGggTjBZfiIXQy7/gBLxiR8sHU1GoRO9URtC6+/Fykngb40SFwbJFNjBPFFUkn0JyUuqcsUCQnXDypLVI5QViEQ6duBqNcNKa3sV2HvLibAcOK6UAAKIicxLnYnB8HaSYGarghPyN61XoWuV4f7t8l+AbfbN+HsqxgoelivGhVpSnwarFRuV2HiAGnmsLSWdQK8oyLIjzpluyyPTozBIF9UMtBsVUdJp4mKmb/UlWpIFjFqzjFhgQKJDkfWvQxaZD/QBH8PFhdJZfBbvg0gnEKQgUFGKyvMtyKFDtiHjYrvSKIECzxQ4S4qxNucz0xBPls8ebVriTS7mFEe0w3Dp0je8Sgwk6ctXbNlb7Pc10aVHwvW47lEg83OTNc8Qtt1eYGnpfM4zvqMzFImY65dBZpPCl6tZfgofP+yqWbr+00YDrNNba+9A033foedGxdNtyxTCSteMm4IKBIKl3Kr2wQM3aP4a3xcspIYGLMzp3hJIlSdaL9KGS40yIse23am3wbyOoQ7k7rw/uHQaOWjcLQp3Eiq4enXedMinzgsYzGP+opECjOK6/Zg6Evfbp9uzEvGdHZOq6za8JWh+i9RdHqKY+DALpQxj4yczfkSHDXeZB5J6v7Imy+1yIwKGiN+VaMbaWJZc/0B4CsphoT 4QYoxxGE rdR4CnFcUF2nXeETZ037gDlc5sJuRAt6hKQ//uU6ZajzSsuh8cNLseJU+6HgKPoAWU41pz621vIAL7wvMynj6USIpprp1D4rW4a9AivcGYw5bbtyAqxw3mVN4V7c81fIHWzgZyXQxeGMN98d5SSW0JzVCVDaKYyKb+rvYv1rlF7vhy6CRSJ3igYAOnRqI1jgzzw3khSMCOa9RK4xG236SrwFWL26xXLhCS4bIk2u9dMnsz3B/ImjANQHDbSB3BBZ4HKjxCW9CbZuOQptjXgsvAU8LJI+lgVK3ifmZ+ApX9p5HfF3PY5gTqGIqVSomXFw/d0pD53SCDosP8L0lcyYkEMm4DegrkG5jkTbCRIdAEj2j9lP8B0jBE8lGNXbqwHUYmlbq3EjvIz7DDT4u2cUyqqIRUGiCIPLU7PtCW+D44CGvwUq1XurViBYINgjnVjLVMQaSFpshqaMiyWsKv0pPPA9y2A== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Sun, Sep 22, 2024 at 7:57=E2=80=AFPM Sabyrzhan Tasbolatov wrote: > arch/x86/include/asm/uaccess.h | 3 +++ > mm/kasan/kasan_test.c | 23 +++++++++++++++++++++++ > 2 files changed, 26 insertions(+) > > diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uacces= s.h > index 3a7755c1a441..e8e5185dd65c 100644 > --- a/arch/x86/include/asm/uaccess.h > +++ b/arch/x86/include/asm/uaccess.h > @@ -620,6 +620,7 @@ do { = \ > > #ifdef CONFIG_CC_HAS_ASM_GOTO_OUTPUT > #define __get_kernel_nofault(dst, src, type, err_label) = \ > + instrument_memcpy_before(dst, src, sizeof(type)); \ > __get_user_size(*((type *)(dst)), (__force type __user *)(src), \ > sizeof(type), err_label) > #else // !CONFIG_CC_HAS_ASM_GOTO_OUTPUT > @@ -627,6 +628,7 @@ do { = \ > do { \ > int __kr_err; \ > \ > + instrument_memcpy_before(dst, src, sizeof(type)); \ > __get_user_size(*((type *)(dst)), (__force type __user *)(src), \ > sizeof(type), __kr_err); \ > if (unlikely(__kr_err)) \ > @@ -635,6 +637,7 @@ do { = \ > #endif // CONFIG_CC_HAS_ASM_GOTO_OUTPUT > > #define __put_kernel_nofault(dst, src, type, err_label) = \ > + instrument_write(dst, sizeof(type)); \ > __put_user_size(*((type *)(src)), (__force type __user *)(dst), \ > sizeof(type), err_label) > Instead of adding KASAN, KCSAN checks per arch macro, here is the alternative, generic way with a wrapper. I've tested it on x86_64 only, going to test on arm64 with KASAN_SW_TAGS, KASAN_HW_TAGS if I can do it in qemu, and form a new patch for all arch and this PATCH v5 for x86 only can be abandoned. Please let me know if this wrapper is good enough, I will see in kasan_test.c how I should use SW/HW_TAG, probably, they should be a separate test with KASAN_TEST_NEEDS_CONFIG_ON(test, CONFIG_KASAN_SW_TAGS); --- include/linux/uaccess.h | 8 ++++++++ mm/kasan/kasan_test.c | 21 +++++++++++++++++++++ mm/maccess.c | 4 ++-- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h index d8e4105a2f21..1b5c23868f97 100644 --- a/include/linux/uaccess.h +++ b/include/linux/uaccess.h @@ -422,6 +422,14 @@ do { \ } while (0) #endif +#define __get_kernel_nofault_wrapper(dst, src, type, err_label) \ + instrument_memcpy_before(dst, src, sizeof(type)); \ + __get_kernel_nofault(dst, src, type, err_label); \ + +#define __put_kernel_nofault_wrapper(dst, src, type, err_label) \ + instrument_write(dst, sizeof(type)); \ + __put_kernel_nofault(dst, src, type, err_label); \ + /** * get_kernel_nofault(): safely attempt to read from a location * @val: read into this variable diff --git a/mm/kasan/kasan_test.c b/mm/kasan/kasan_test.c index 567d33b493e2..ae05c8858c07 100644 --- a/mm/kasan/kasan_test.c +++ b/mm/kasan/kasan_test.c @@ -1944,6 +1944,26 @@ static void match_all_mem_tag(struct kunit *test) kfree(ptr); } +static void copy_from_to_kernel_nofault_oob(struct kunit *test) +{ + char *ptr; + char buf[128]; + size_t size =3D sizeof(buf); + + ptr =3D kmalloc(size - KASAN_GRANULE_SIZE, GFP_KERNEL); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); + + KUNIT_EXPECT_KASAN_FAIL(test, + copy_from_kernel_nofault(&buf[0], ptr, size)); + KUNIT_EXPECT_KASAN_FAIL(test, + copy_from_kernel_nofault(ptr, &buf[0], size)); + KUNIT_EXPECT_KASAN_FAIL(test, + copy_to_kernel_nofault(&buf[0], ptr, size)); + KUNIT_EXPECT_KASAN_FAIL(test, + copy_to_kernel_nofault(ptr, &buf[0], size)); + kfree(ptr); +} + static struct kunit_case kasan_kunit_test_cases[] =3D { KUNIT_CASE(kmalloc_oob_right), KUNIT_CASE(kmalloc_oob_left), @@ -2017,6 +2037,7 @@ static struct kunit_case kasan_kunit_test_cases[] =3D= { KUNIT_CASE(match_all_not_assigned), KUNIT_CASE(match_all_ptr_tag), KUNIT_CASE(match_all_mem_tag), + KUNIT_CASE(copy_from_to_kernel_nofault_oob), {} }; diff --git a/mm/maccess.c b/mm/maccess.c index 518a25667323..a3533a0d0677 100644 --- a/mm/maccess.c +++ b/mm/maccess.c @@ -15,7 +15,7 @@ bool __weak copy_from_kernel_nofault_allowed(const void *unsafe_src, #define copy_from_kernel_nofault_loop(dst, src, len, type, err_label) \ while (len >=3D sizeof(type)) { \ - __get_kernel_nofault(dst, src, type, err_label); \ + __get_kernel_nofault_wrapper(dst, src, type, err_label);\ dst +=3D sizeof(type); \ src +=3D sizeof(type); \ len -=3D sizeof(type); \ @@ -49,7 +49,7 @@ EXPORT_SYMBOL_GPL(copy_from_kernel_nofault); #define copy_to_kernel_nofault_loop(dst, src, len, type, err_label) \ while (len >=3D sizeof(type)) { \ - __put_kernel_nofault(dst, src, type, err_label); \ + __put_kernel_nofault_wrapper(dst, src, type, err_label);\ dst +=3D sizeof(type); \ src +=3D sizeof(type); \ len -=3D sizeof(type); \ --