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 0E7ADC54798 for ; Fri, 23 Feb 2024 20:25:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2CEBE6B0071; Fri, 23 Feb 2024 15:25:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 27E1D6B0072; Fri, 23 Feb 2024 15:25:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 146806B0074; Fri, 23 Feb 2024 15:25:16 -0500 (EST) 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 062996B0071 for ; Fri, 23 Feb 2024 15:25:16 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 7CEB4120194 for ; Fri, 23 Feb 2024 20:25:15 +0000 (UTC) X-FDA: 81824198190.11.6A0D182 Received: from postout1.mail.lrz.de (postout1.mail.lrz.de [129.187.255.137]) by imf06.hostedemail.com (Postfix) with ESMTP id 18F8418001A for ; Fri, 23 Feb 2024 20:25:12 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=tum.de header.s=tu-postout21 header.b=QdGni1Nl; spf=pass (imf06.hostedemail.com: domain of paul.heidekrueger@tum.de designates 129.187.255.137 as permitted sender) smtp.mailfrom=paul.heidekrueger@tum.de; dmarc=pass (policy=none) header.from=tum.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1708719913; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=XogPvV4ziidUn001lArst0K7vLGykcShOSoSCX7zFXA=; b=z94LAvii6EMO5YWZj6Cl0qGnbJiIaERPRH4EGF57uzlnMEbR9KSSZ3FpUJvHZg4+NRzebO oyiK8yWzTAITg7uD9YjCxuoS6FauwtFcbih31RsJhYyocanUz1kmP8pp4EqMu7KCjlm2jf AoYnEP63nQcDqhhL4gstAHSyhtJH+Rk= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=tum.de header.s=tu-postout21 header.b=QdGni1Nl; spf=pass (imf06.hostedemail.com: domain of paul.heidekrueger@tum.de designates 129.187.255.137 as permitted sender) smtp.mailfrom=paul.heidekrueger@tum.de; dmarc=pass (policy=none) header.from=tum.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708719913; a=rsa-sha256; cv=none; b=oz79KYyuLwfeMUbvowrzfd/sd2zXkw/lbn9b1F80cUzCoAlyLMJ1X+WqBifPzEXxD+cqq3 Am0OJy9KFcMsl/0gbsWvTmurGdWb87nQNi5VM0DbwBgd1BaZmzqJXi60BZEOV7UcnyVUtH r5UxIb8GGAtNVI0ZgyjYpxvr5Ph9sQE= Received: from lxmhs51.srv.lrz.de (localhost [127.0.0.1]) by postout1.mail.lrz.de (Postfix) with ESMTP id 4ThM2G0WTdzyRZ; Fri, 23 Feb 2024 21:25:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tum.de; h= in-reply-to:content-disposition:content-type:content-type :mime-version:references:message-id:subject:subject:from:from :date:date:received:received; s=tu-postout21; t=1708719909; bh=t 49cO6p/CTxhIsPf6wPOW6TnOQjFamJon7viBIklUlQ=; b=QdGni1Nl4b/VarWPf cOz9HAMhlhSMjGDP3FjegOY7o2/GGapmYxtmsDBEH2a0yhgSpIntNu5YD2vHg1go uT01paaGaeHyQMqyBLTMwH+dmpqJ9M3PFoHSnhdzWqKO/bbDRT+xnA2IoMWWxvgd kHizpe/D9caNtxT8mXa6UGEQgFen7GzpiDJT31LFwNdA2YEEvbPh4My+ksJpMHnJ S0Nn7PavlDh26T5d5PWFXovLQGSO+WXKVEXVYV+izkctRxpksvv7aNyNdl8jnyzE Uz7pyfhQzTPGkYVIfbI1bDP2QU8Ct9QFjevSjcoiBSlAS6SDJjELjkYZ/mdrhN35 XFTUA== X-Virus-Scanned: by amavisd-new at lrz.de in lxmhs51.srv.lrz.de Received: from postout1.mail.lrz.de ([127.0.0.1]) by lxmhs51.srv.lrz.de (lxmhs51.srv.lrz.de [127.0.0.1]) (amavisd-new, port 20024) with LMTP id nRFE3cd62g-f; Fri, 23 Feb 2024 21:25:09 +0100 (CET) Received: from pine (unknown [IPv6:2001:a61:2510:5501:544b:4b32:4119:3827]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by postout1.mail.lrz.de (Postfix) with ESMTPSA id 4ThM2D07zKzych; Fri, 23 Feb 2024 21:25:07 +0100 (CET) Date: Fri, 23 Feb 2024 21:25:04 +0100 From: Paul =?utf-8?Q?Heidekr=C3=BCger?= To: Andrew Morton Cc: kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, vincenzo.frascino@arm.com, ryabinin.a.a@gmail.com, mark.rutland@arm.com, glider@google.com, elver@google.com, dvyukov@google.com, andreyknvl@gmail.com Subject: Re: [merged mm-stable] kasan-add-atomic-tests.patch removed from -mm tree Message-ID: References: <20240222000304.8FA56C43390@smtp.kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240222000304.8FA56C43390@smtp.kernel.org> X-Rspamd-Queue-Id: 18F8418001A X-Rspam-User: X-Stat-Signature: ydmhjrmwnwhd5g1a4ga7iihjfket58g9 X-Rspamd-Server: rspam01 X-HE-Tag: 1708719912-346749 X-HE-Meta: U2FsdGVkX19AumCeZg4BupOi5Bbmccxw/jZMgzfcRI3AUyl35HRnjxJnWkLB0SKnCts1jD90z6mbfsVmIfK9G4PvVWjvMZ05XL7PAzkyhMuM3gtWEXd7q/gE6PsespB5+2Lwvzb4X+Mi2IrZHLFMEwsfMZHbzNQzO6/C6BvYdpyOm/1odZrBZylXAPK9bvJcmt9omjAldKoDszFD1LexcsZwIqct3xAthb1HuFsCa8GBkc7faQBn5OYMdWn9GiPeFLyzWf6TWwRAnmuQ8NpmFdF0EI49zhnR8XTUZ0MLw5OY1xFtSprIUNCALAa1sXV/D1gnI9i35Hb9T7XyYIzGJeBDJcrCodhErNu8PDccwq+MfyDYJXF0rRhGiDxxEpURZ9JqUS68yXLQ6SzDESiTMaEbcBS5gJ7NjfG8pd/P0a1uGb9+IzqiDNd3kt3PoV8nAlZbihvec7rwkzQVnpk7kz4TkZQ2TEZ+fQWxVTsd8WTcz0V2NtoFm4v6mfVwIoqG88i7VPIt02G0WBmjM015mD59tQVosDQGN6gW9+KyLtIgGiiOmATnf8aGR4lu5368NOn62/OUKFPj1imBDsyqsCfF5q+86r+CKFvIIPQII97q4DSU5+2uQWPEkUOfImNaUoegd1aKZ1wRgndz0opDfmt2uHTZ/cV9dNAXQn6XRWLQqbIJ+tYEesE0/0omIQHKiTDrAT1NGkE0ratYA5p0HfKoFayokVnMTIU1jXD/wD0QoOmxJ0KquDCGvaUaK/BDfiM7gHTmVKlWCy+nrJ68vzy7B2R0YD3s215ZXRY6Wn1Z83mEdvwmAV3iuodFKqbm53XsDpNmrCv0FeEBNtolGBwVRAi8mcBwhgw8uuLSYP5ybXJsd70CHQx1N9wv8DwbFMvw5zTF6Spu2YOOOI/7HBAf3aKpymnSn7zrViDBkY45EuL3332uIqRY+UnSrkaeSM1iVWHlFszNRKL4nTn 5svFvbYn cXGfC2ugFg7hBe8oW7qrUK+MOznUCCudu68sh6bIXlCV1PqLWIQlZjIa2Yde+NyG404FGfwo80Q7M9p298km6C9ye54ZgPV/450YEuqo/z7+i4i9Vd0CvOPyrmu0NCBxaeVdgsp/gjnhTPKMLEhJHZIuPWs9NxD5AAromenzbixodNVHsg4kzF/Qrp7Arh8wZaGznD5VjmKDBdY6B5vzk/3AxJq5jtLnvTXelKaNsABvLjPZ0zeQv6CIOcqTzkQtNMkXBCdhy4NrFXJ2F/7v/ttQXEezSJcc8N51q52xqFVAqqhY+ZHcH0P2qpxKCUqO46OxfyK5HlgjGlV36vn00KQHZsNc9xuiRuqY9NXW1TluVdPuuGGm09aRSFzEwPJqWvZ5hj/OiQ2g8lf++9nAc68/F/z8LWElHVa3RFuSg+LFTOpKCIKa40Bh+sHKRC7XnlKysd8XUZIMmwcVqQ979YHTsU9Nh/5IHwvaDYxvunskt1kQdJC1eLNDy0dmXFfI3ieBX2ued2+z+Agryqoy7tlku4w== 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 21.02.2024 16:03, Andrew Morton wrote: > > The quilt patch titled > Subject: kasan: add atomic tests > has been removed from the -mm tree. Its filename was > kasan-add-atomic-tests.patch > > This patch was dropped because it was merged into the mm-stable branch > of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm > > ------------------------------------------------------ > From: Paul Heidekr??ger > Subject: kasan: add atomic tests > Date: Fri, 2 Feb 2024 11:32:59 +0000 > > Test that KASan can detect some unsafe atomic accesses. > > As discussed in the linked thread below, these tests attempt to cover > the most common uses of atomics and, therefore, aren't exhaustive. > > Link: https://lkml.kernel.org/r/20240202113259.3045705-1-paul.heidekrueger@tum.de > Link: https://lore.kernel.org/all/20240131210041.686657-1-paul.heidekrueger@tum.de/T/#u > Signed-off-by: Paul Heidekr??ger > Closes: https://bugzilla.kernel.org/show_bug.cgi?id=214055 > Acked-by: Mark Rutland > Cc: Marco Elver > Cc: Andrey Konovalov > Cc: Alexander Potapenko > Cc: Andrey Ryabinin > Cc: Dmitry Vyukov > Cc: Vincenzo Frascino > Signed-off-by: Andrew Morton > --- > > mm/kasan/kasan_test.c | 79 ++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 79 insertions(+) > > --- a/mm/kasan/kasan_test.c~kasan-add-atomic-tests > +++ a/mm/kasan/kasan_test.c > @@ -697,6 +697,84 @@ static void kmalloc_uaf3(struct kunit *t > KUNIT_EXPECT_KASAN_FAIL(test, ((volatile char *)ptr1)[8]); > } > > +static void kasan_atomics_helper(struct kunit *test, void *unsafe, void *safe) > +{ > + int *i_unsafe = (int *)unsafe; > + > + KUNIT_EXPECT_KASAN_FAIL(test, READ_ONCE(*i_unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, WRITE_ONCE(*i_unsafe, 42)); > + KUNIT_EXPECT_KASAN_FAIL(test, smp_load_acquire(i_unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, smp_store_release(i_unsafe, 42)); > + > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_read(unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_set(unsafe, 42)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_add(42, unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_sub(42, unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_inc(unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_dec(unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_and(42, unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_andnot(42, unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_or(42, unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_xor(42, unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_xchg(unsafe, 42)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_cmpxchg(unsafe, 21, 42)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_try_cmpxchg(unsafe, safe, 42)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_try_cmpxchg(safe, unsafe, 42)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_sub_and_test(42, unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_dec_and_test(unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_inc_and_test(unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_add_negative(42, unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_add_unless(unsafe, 21, 42)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_inc_not_zero(unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_inc_unless_negative(unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_dec_unless_positive(unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_dec_if_positive(unsafe)); > + > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_read(unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_set(unsafe, 42)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_add(42, unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_sub(42, unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_inc(unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_dec(unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_and(42, unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_andnot(42, unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_or(42, unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_xor(42, unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_xchg(unsafe, 42)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_cmpxchg(unsafe, 21, 42)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_try_cmpxchg(unsafe, safe, 42)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_try_cmpxchg(safe, unsafe, 42)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_sub_and_test(42, unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_dec_and_test(unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_inc_and_test(unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_add_negative(42, unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_add_unless(unsafe, 21, 42)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_inc_not_zero(unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_inc_unless_negative(unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_dec_unless_positive(unsafe)); > + KUNIT_EXPECT_KASAN_FAIL(test, atomic_long_dec_if_positive(unsafe)); > +} > + > +static void kasan_atomics(struct kunit *test) > +{ > + void *a1, *a2; > + > + /* > + * Just as with kasan_bitops_tags(), we allocate 48 bytes of memory such > + * that the following 16 bytes will make up the redzone. > + */ > + a1 = kzalloc(48, GFP_KERNEL); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, a1); > + a2 = kzalloc(sizeof(int), GFP_KERNEL); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, a1); > + > + /* Use atomics to access the redzone. */ > + kasan_atomics_helper(test, a1 + 48, a2); > + > + kfree(a1); > + kfree(a2); > +} > + > static void kmalloc_double_kzfree(struct kunit *test) > { > char *ptr; > @@ -1883,6 +1961,7 @@ static struct kunit_case kasan_kunit_tes > KUNIT_CASE(kasan_strings), > KUNIT_CASE(kasan_bitops_generic), > KUNIT_CASE(kasan_bitops_tags), > + KUNIT_CASE(kasan_atomics), > KUNIT_CASE(vmalloc_helpers_tags), > KUNIT_CASE(vmalloc_oob), > KUNIT_CASE(vmap_tags), > _ > > Patches currently in -mm which might be from paul.heidekrueger@tum.de are > > Hi Andrew! There was further discussion around this patch [1], which led to a v3 of the above patch but might have gotten lost in the wave of emails. I'm unsure what the protocol is now; do I send you a new patch for the diff between the above patch and the v3 patch, or can you just use v3 instead of the above patch? I hope this doesn't cause too much trouble. Many thanks, Paul [1]: https://lore.kernel.org/all/20240212083342.3075850-1-paul.heidekrueger@tum.de/