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 7F68ACF2579 for ; Sun, 13 Oct 2024 16:02:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A91BC6B0082; Sun, 13 Oct 2024 12:02:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A19E16B0083; Sun, 13 Oct 2024 12:02:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8C5A96B0085; Sun, 13 Oct 2024 12:02:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 6D9496B0082 for ; Sun, 13 Oct 2024 12:02:40 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 8C78440923 for ; Sun, 13 Oct 2024 16:02:35 +0000 (UTC) X-FDA: 82669046670.27.2E87BAC Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by imf29.hostedemail.com (Postfix) with ESMTP id 5B814120018 for ; Sun, 13 Oct 2024 16:02:31 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=COZSx4FI; spf=pass (imf29.hostedemail.com: domain of andreyknvl@gmail.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=andreyknvl@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728835286; a=rsa-sha256; cv=none; b=iLJOMK27K+f7d4gYwl1SutRNLDmx55SqArl2RMrd1MVTJdNoRMxRi3pysknywMnCV27CVL mhk31MDMrYve5L7headJGphpfukCw6XfLcTbWyudjP30F2b97omhrr2CLA/Kih82X0FDia xhj9HB9yhztRc2Fr0WNoyKozoo/nj5w= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=COZSx4FI; spf=pass (imf29.hostedemail.com: domain of andreyknvl@gmail.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=andreyknvl@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=1728835286; 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=gtZxueZi13H6/At0/KFVJVek0RE4B8mMqip4J0nMs5M=; b=Gtzg7Q0AiX/KPU4dQ4T9wflWPphnZVs4tzLizlYrX0FwUV10kT8AtPAMqshSvv4IDlOyM0 OrMEnU0owKiY2BNQ215KpnBBfXqj1BPZhneHiESjaEsEUwXTos5iJ5fd5MZDPmulaJ/dt3 sEQFLTwyyPbtyUUGRjobaTZDixSPbnM= Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-37d63a79bb6so899382f8f.0 for ; Sun, 13 Oct 2024 09:02:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728835356; x=1729440156; 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=gtZxueZi13H6/At0/KFVJVek0RE4B8mMqip4J0nMs5M=; b=COZSx4FIblhuNFt/JuEGRt4wcip48SLtsigGFmd4NWKXAsQUdB5B4MZncDXpdOiHyy begG2RjEOX9Rg0+PnZM8JKY9aSMy0T09iiHZinXigksKwxeoG4pgHpF4EA2QFM7l8Lgj BWTS0EIeraFZzPD8On+riv4oLvQpuQaPKMXTnlKqTBSKRqC8i7lJv9cApOf5ddMvTtLx q03sfT0fZzA/+ZbSQv06xsIAWcbACb4RX3+BY3HxLutAF9v559ulepDlMVSzrbHIf7je T/p6BNN7l+rc0ymVDfl46gHV3AiWZmfeOxpLXVRVpELa2/dGaM8ufJ7EgI6jp/0vvvsE /xiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728835356; x=1729440156; 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=gtZxueZi13H6/At0/KFVJVek0RE4B8mMqip4J0nMs5M=; b=NAOZWcAjxpHrlqNkVcTOj58FbAnxwtrUJEe4CTmiJ4WT5gvHUqIzhzIgfWf56WNhvL ROf0C2mEhwYwHHA0KUAt/QGq6ajnzYwtY2jfjVMxhrJ1W+nKl9sqqKJYf6JEG0AChEzz ISFalgAnrR7ubkHW9EQMFbaJ+7cTKOjda+NMn8MYXrWN2f1lKZF7CEMEcXz1ill78NrW GJUQmyCA35HGN6UP5dX/jvQ8nuiLhaCMifGQjpfkZ+BcsAr8Ehdj6RfMlciHUBviO2pZ dwFheYCyo8WHCLhO4+zUljoAJw7TNa2kYN5JchGpsZrfyEXjGqjXEM2+OjfZA9Zs8B9j tmwQ== X-Forwarded-Encrypted: i=1; AJvYcCWjzTV8ltfaIkDZeQe0JDsPDlRPCCM9wHFicIrTRfhMbohDXD/eUjIxpSP4clSUstrwSu5mRcO5vA==@kvack.org X-Gm-Message-State: AOJu0Yy2/GdQuIuAwTSkpxvvvrHlpdzcrnqU6pQh0n1d/RzSXTMSDrI3 ItJQ3vtZBtr0lIHJqpBWPSoX9KS5v9pYtBkG8+PENvykzdZl6z79pcaOwJeZ5DupxsoWcPk15ei MknVBisrfALr1mCHn8DH9uQn6ss4= X-Google-Smtp-Source: AGHT+IEGwD3FDjvSsOlE0IwPOiIWB1PKck6HQr/37VKoILCE1zt5hsWeGBJiNCRcNstMehR9GGkP7NyKNIxim68N5wA= X-Received: by 2002:a05:6000:4f0:b0:37d:5103:e41d with SMTP id ffacd0b85a97d-37d5529f022mr6528622f8f.39.1728835356135; Sun, 13 Oct 2024 09:02:36 -0700 (PDT) MIME-Version: 1.0 References: <20241013130211.3067196-1-snovitoll@gmail.com> <20241013130211.3067196-3-snovitoll@gmail.com> In-Reply-To: <20241013130211.3067196-3-snovitoll@gmail.com> From: Andrey Konovalov Date: Sun, 13 Oct 2024 18:02:24 +0200 Message-ID: Subject: Re: [PATCH v2 2/3] kasan: migrate copy_user_test to kunit To: Sabyrzhan Tasbolatov Cc: akpm@linux-foundation.org, dvyukov@google.com, glider@google.com, kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, ryabinin.a.a@gmail.com, vincenzo.frascino@arm.com, elver@google.com, corbet@lwn.net, alexs@kernel.org, siyanteng@loongson.cn, 2023002089@link.tyut.edu.cn, workflows@vger.kernel.org, linux-doc@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Stat-Signature: ernwqn6b4iir8igif3skzqzm4iuuuofn X-Rspamd-Queue-Id: 5B814120018 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1728835351-76619 X-HE-Meta: U2FsdGVkX19q4HKSsKTBXnoucP+Pey3DykWcNz4YKpISvIFC5prUeWrzyk5zdDp9jdLCkhkmMYB5aM41Na0WvfiNPwGK95Y5DDrsU0zyETEWKSiNIdlZBYO9z4s0Mr37qsibRDA1+XMHBPKN7SlzOkzWmpl/AVq/xW+A9cvmy1qo9wCNPpcJx2Gty/eogTx/mz3zwipjL/mdnpIr7z9Dle7R9wlG+mIIUVD12531s4t+EMKz33yvcfF/FKNuwLglzGOgt7l0IO/dSeuYZjD90XtJze93rBDjyQE8eh6AWvt/OfKEl5qYPhlLcqpHvEkvoRoXnkHrd8yATqOww+NYz/EfQM8MVpuxk/IhEJmDv3wXcx6OeIjCSxjhchBS+kdmdhIfdrpEe6WnnjhqQbzjQHvv3asCnbLpdhyOGJQkszB/9xcaEvub+Ca8les9lDKP4LLSE8b0yD/fjz9zJYHXT50O0Fg8SV7T1eJKoSP+3bHu8cskjsvGX84P3ZR5KjHZLkdfzdlQ6xPOqX20bm3rpJqeEx/TY4UmOKe0F6/x6w2h9ivLIR6Wh1DApZj9NCjr5aiYuQmXPY2JXWRyVK29Fk1sUDDI7ZOFSidkQz7kbcrI7NohzKB2rajhphIqUOgDIUPD8fFDWrQ3B4WmDyLI339+ZqddnbL9/a8VXfxER7pEx85YNmfZHoPBFZM3wINjxbljjxr4siXtaH1PYBzUgzJNc7dT71M8tKeMbZh3QG8xDGu0H984+TW9PaLdnuuXgjuyTHoicwNs/dkoCIO4gzBk3nMFsBXI+7hgb1gdw/YwpzpXhgSsHhxWq0PWuosx6UwbdoD+jpCLgmAMV8ii88LhRlGZQnJo5JnmGkhfjpJfvb8RspsRXL6NSlz4BWBMn8No6NpqpLrSaHTZ4tSR5qKyjf9PDI7259JSeN8S/mMCAyiiooF3Xy3wHqu5hY7x4ZgoLmdDxBJpbITcJ0n ChJTjcCW lv2Wag3yfDJRMj4NU0rsi0+zcZQfQ07ZVhivOu4bGPvpav0Q66wA6sMB/voInwvCfsU3vgTteRlgSm6CIcOrXstkG2fgpBWpxtnpCq5IaQxuPZHSxyJDo4o2uhNFdSebxQVwh5tDNUX6JEG515zww0h25PdHCXcEhpA1hM2S7qvbUf6gOTubG5rhARdLmXvOREEtzSlblpeDxLZdV7DCHN3ImIJqVYjrG13WwkJMUn9rr02x+ElQcdRcSKelVlm5h8qRQb4h6MYpSVYMaUYbCOMsb7b7Y9dSEp518ML1tOKozS/BPjcL0RQQvjifMw6xBa/MfcHMEwz32opAtEqHfTQKhXvqNgDzyfkUyD75uYgHunU3jW6F7lfbSgFfq1stzgC6klIn2oC6qcexJt3ccJVKNxZya6uGAmDTCtJZM9CJY2xmiKeWQJd4LBvkUe8qmb2qwfDV+pyEppUN/UhTFgye2QwdAVWtB/BknbsrFdIy1sZI= 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, Oct 13, 2024 at 3:02=E2=80=AFPM Sabyrzhan Tasbolatov wrote: > > Migrate the copy_user_test to the KUnit framework to verify out-of-bound > detection via KASAN reports in copy_from_user(), copy_to_user() and > their static functions. > > This is the last migrated test in kasan_test_module.c, therefore delete > the file. > > Signed-off-by: Sabyrzhan Tasbolatov > --- > mm/kasan/Makefile | 2 - > mm/kasan/kasan_test_c.c | 39 +++++++++++++++++ > mm/kasan/kasan_test_module.c | 81 ------------------------------------ > 3 files changed, 39 insertions(+), 83 deletions(-) > delete mode 100644 mm/kasan/kasan_test_module.c > > diff --git a/mm/kasan/Makefile b/mm/kasan/Makefile > index b88543e5c0c..1a958e7c8a4 100644 > --- a/mm/kasan/Makefile > +++ b/mm/kasan/Makefile > @@ -46,7 +46,6 @@ endif > > CFLAGS_kasan_test_c.o :=3D $(CFLAGS_KASAN_TEST) > RUSTFLAGS_kasan_test_rust.o :=3D $(RUSTFLAGS_KASAN) > -CFLAGS_kasan_test_module.o :=3D $(CFLAGS_KASAN_TEST) > > obj-y :=3D common.o report.o > obj-$(CONFIG_KASAN_GENERIC) +=3D init.o generic.o report_generic.o shado= w.o quarantine.o > @@ -59,4 +58,3 @@ ifdef CONFIG_RUST > endif > > obj-$(CONFIG_KASAN_KUNIT_TEST) +=3D kasan_test.o > -obj-$(CONFIG_KASAN_MODULE_TEST) +=3D kasan_test_module.o > diff --git a/mm/kasan/kasan_test_c.c b/mm/kasan/kasan_test_c.c > index a181e4780d9..e71a16d0dfb 100644 > --- a/mm/kasan/kasan_test_c.c > +++ b/mm/kasan/kasan_test_c.c > @@ -1954,6 +1954,44 @@ static void rust_uaf(struct kunit *test) > KUNIT_EXPECT_KASAN_FAIL(test, kasan_test_rust_uaf()); > } > > +static void copy_user_test_oob(struct kunit *test) > +{ > + char *kmem; > + char __user *usermem; > + unsigned long useraddr; > + size_t size =3D 128 - KASAN_GRANULE_SIZE; > + int __maybe_unused unused; > + > + kmem =3D kunit_kmalloc(test, size, GFP_KERNEL); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, kmem); > + > + useraddr =3D kunit_vm_mmap(test, NULL, 0, PAGE_SIZE, > + PROT_READ | PROT_WRITE | PROT_EXE= C, > + MAP_ANONYMOUS | MAP_PRIVATE, 0); > + KUNIT_ASSERT_NE_MSG(test, useraddr, 0, > + "Could not create userspace mm"); > + KUNIT_ASSERT_LT_MSG(test, useraddr, (unsigned long)TASK_SIZE, > + "Failed to allocate user memory"); > + > + OPTIMIZER_HIDE_VAR(size); > + usermem =3D (char __user *)useraddr; > + > + KUNIT_EXPECT_KASAN_FAIL(test, > + unused =3D copy_from_user(kmem, usermem, size + 1)); > + KUNIT_EXPECT_KASAN_FAIL(test, > + unused =3D copy_to_user(usermem, kmem, size + 1)); > + KUNIT_EXPECT_KASAN_FAIL(test, > + unused =3D __copy_from_user(kmem, usermem, size + 1)); > + KUNIT_EXPECT_KASAN_FAIL(test, > + unused =3D __copy_to_user(usermem, kmem, size + 1)); > + KUNIT_EXPECT_KASAN_FAIL(test, > + unused =3D __copy_from_user_inatomic(kmem, usermem, size = + 1)); > + KUNIT_EXPECT_KASAN_FAIL(test, > + unused =3D __copy_to_user_inatomic(usermem, kmem, size + = 1)); Here, add: + + /* + * Prepare a long string in usermem to avoid the strncpy_from_user = test + * bailing out on '\0' before it reaches out-of-bounds. + */ + memset(kmem, 'a', size); + KUNIT_EXPECT_EQ(test, copy_to_user(usermem, kmem, size), 0); + This fixes the last test. > + KUNIT_EXPECT_KASAN_FAIL(test, > + unused =3D strncpy_from_user(kmem, usermem, size + 1)); > +} > + > static struct kunit_case kasan_kunit_test_cases[] =3D { > KUNIT_CASE(kmalloc_oob_right), > KUNIT_CASE(kmalloc_oob_left), > @@ -2028,6 +2066,7 @@ static struct kunit_case kasan_kunit_test_cases[] = =3D { > KUNIT_CASE(match_all_ptr_tag), > KUNIT_CASE(match_all_mem_tag), > KUNIT_CASE(rust_uaf), > + KUNIT_CASE(copy_user_test_oob), > {} > }; > > diff --git a/mm/kasan/kasan_test_module.c b/mm/kasan/kasan_test_module.c > deleted file mode 100644 > index 27ec22767e4..00000000000 > --- a/mm/kasan/kasan_test_module.c > +++ /dev/null > @@ -1,81 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0-only > -/* > - * > - * Copyright (c) 2014 Samsung Electronics Co., Ltd. > - * Author: Andrey Ryabinin > - */ > - > -#define pr_fmt(fmt) "kasan: test: " fmt > - > -#include > -#include > -#include > -#include > -#include > - > -#include "kasan.h" > - > -static noinline void __init copy_user_test(void) > -{ > - char *kmem; > - char __user *usermem; > - size_t size =3D 128 - KASAN_GRANULE_SIZE; > - int __maybe_unused unused; > - > - kmem =3D kmalloc(size, GFP_KERNEL); > - if (!kmem) > - return; > - > - usermem =3D (char __user *)vm_mmap(NULL, 0, PAGE_SIZE, > - PROT_READ | PROT_WRITE | PROT_EXEC, > - MAP_ANONYMOUS | MAP_PRIVATE, 0); > - if (IS_ERR(usermem)) { > - pr_err("Failed to allocate user memory\n"); > - kfree(kmem); > - return; > - } > - > - OPTIMIZER_HIDE_VAR(size); > - > - pr_info("out-of-bounds in copy_from_user()\n"); > - unused =3D copy_from_user(kmem, usermem, size + 1); > - > - pr_info("out-of-bounds in copy_to_user()\n"); > - unused =3D copy_to_user(usermem, kmem, size + 1); > - > - pr_info("out-of-bounds in __copy_from_user()\n"); > - unused =3D __copy_from_user(kmem, usermem, size + 1); > - > - pr_info("out-of-bounds in __copy_to_user()\n"); > - unused =3D __copy_to_user(usermem, kmem, size + 1); > - > - pr_info("out-of-bounds in __copy_from_user_inatomic()\n"); > - unused =3D __copy_from_user_inatomic(kmem, usermem, size + 1); > - > - pr_info("out-of-bounds in __copy_to_user_inatomic()\n"); > - unused =3D __copy_to_user_inatomic(usermem, kmem, size + 1); > - > - pr_info("out-of-bounds in strncpy_from_user()\n"); > - unused =3D strncpy_from_user(kmem, usermem, size + 1); > - > - vm_munmap((unsigned long)usermem, PAGE_SIZE); > - kfree(kmem); > -} > - > -static int __init kasan_test_module_init(void) > -{ > - /* > - * Temporarily enable multi-shot mode. Otherwise, KASAN would onl= y > - * report the first detected bug and panic the kernel if panic_on= _warn > - * is enabled. > - */ > - bool multishot =3D kasan_save_enable_multi_shot(); > - > - copy_user_test(); > - > - kasan_restore_multi_shot(multishot); > - return -EAGAIN; > -} > - > -module_init(kasan_test_module_init); > -MODULE_LICENSE("GPL"); > -- > 2.34.1 >