From patchwork Mon Oct 14 02:56:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sabyrzhan Tasbolatov X-Patchwork-Id: 13834113 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 13BDCCF259F for ; Mon, 14 Oct 2024 02:56:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 953D46B008C; Sun, 13 Oct 2024 22:56:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 904CD6B0092; Sun, 13 Oct 2024 22:56:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 756976B0093; Sun, 13 Oct 2024 22:56:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 55D0B6B008C for ; Sun, 13 Oct 2024 22:56:09 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 1FFC11A0AA9 for ; Mon, 14 Oct 2024 02:55:56 +0000 (UTC) X-FDA: 82670693490.05.B170372 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) by imf07.hostedemail.com (Postfix) with ESMTP id 0F1B84000C for ; Mon, 14 Oct 2024 02:55:58 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=jN6tcdsY; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf07.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.208.44 as permitted sender) smtp.mailfrom=snovitoll@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728874452; a=rsa-sha256; cv=none; b=va1K7q5ukpQ1VyH1kpHJ8L366MyCE/RXwaH9IxiYjv+YdbQyc7mMz2ovE/TLoBzNCcW4MY xyz87dH73WoUz3Wb0nU62UHUze5ZPIXDX9rO7u58LI6duSKESxj3c/wuTQ7+jbgpyDFAai 8svKRYuDalxnRcDKonIGcxplBTryzf0= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=jN6tcdsY; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf07.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.208.44 as permitted sender) smtp.mailfrom=snovitoll@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1728874452; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=fsia9jopa1EBGuIlree1T5OAe+wj8zghwoJWVSExaNA=; b=LcIooYC/kzsEFaBGCSfAEMulsEHuw+ZbgNPvzJywFPSRRiDnoV4AZo2hW+96SLQx+bJWKP ibkblDy2nloiWtjnvcCxuqugGf6oHpOLNdEYJ744Rs3fm+gDPTE/OK8sJMsmyRqqMEQV0X Of/I0NY0Xy7g8NlRSWWbXOyJth+f7no= Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-5c9709c9b0cso1285848a12.1 for ; Sun, 13 Oct 2024 19:56:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728874565; x=1729479365; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fsia9jopa1EBGuIlree1T5OAe+wj8zghwoJWVSExaNA=; b=jN6tcdsY2kFWO/1X5ctLyjlNfTqFUTnTcstp88h0g2up+xxc+8U568UiCleakvtDPd +QJ767MDeQuFDNR8ScHZTlcyTsa0BdtD2xf3YXGq7mLNl7dyiSATvac/7GonTj8op4qK ajc03FTAeidy7Mpoc2FufgIH6FrXKFIbXhv0KP3EpHQgMBKFBsa1NarQM2BvgdXg6oMm F2CVywZFXvcKZ1oy61B5fFOqehRzxwPHCso8u/bv6vDqKvGl952+ecauXmGqYNR/lf1y j5UwCsGe4kvkQbvr0ke8ZIMFfAinjTZFUnX1aOmHZwZReml12dfvjma7is2Pv6PsMo9P mDGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728874565; x=1729479365; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fsia9jopa1EBGuIlree1T5OAe+wj8zghwoJWVSExaNA=; b=P7luPOyXLQCX5mzcMLTqbLzZgxpRee1JclzxMuNUV22UYAaIZVWW+1RYEAHV1HT/z5 LzrUn/iAfxKevhckl0L341Cqx2TshNfTd0s/SKCxH0+lmPF4zPOMKuYyWRCy1AfCvoa4 If4LC1a/pJaoAXww25OhYB+W9M+VfhrWLbFICGwn8AF7O5K4Sv9RavkfY+4T5gbn19CS rRjMVSfbcgsDxDpkgCJ2b/VbPgJhwljxeh96N2HBykFaz3g2NCnwO7UtSx8mHxE9xSKn +64zk2vWB1gbDFBabJzkNwZ3c8pjU5LAPN+nzeNzOclZG3f4RMIRIqwO0lJ3iEwLMATT YZow== X-Forwarded-Encrypted: i=1; AJvYcCVPIiwxJYBFoCt2vNcUpqThtNECB0A3/xzCJmLXM3YHJEbj55XlKtF2wPXqzKD2E+JJq7mqvqD+8A==@kvack.org X-Gm-Message-State: AOJu0Yzfi4kcAOeWKetwhUkx5p5538MPKwVRvJCCLlQupQ3OhPrYxNMh C0K69fkfnRQ37OAUZtxnvHTJdcjor7diQQBPjGQsqpr9NvaqiZ3d X-Google-Smtp-Source: AGHT+IGnwwZeigphOJ9brMGXGLoktj1FJV8WBeBfj1WroyrEnTp3w3CdGAC9gyG0bLeuTFdMUZwEGA== X-Received: by 2002:a17:906:6a12:b0:a99:742c:5c7 with SMTP id a640c23a62f3a-a99b9305ed1mr791073066b.10.1728874565516; Sun, 13 Oct 2024 19:56:05 -0700 (PDT) Received: from work.. (2.133.25.254.dynamic.telecom.kz. [2.133.25.254]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a99ebdfbff1sm270501366b.39.2024.10.13.19.56.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Oct 2024 19:56:05 -0700 (PDT) From: Sabyrzhan Tasbolatov To: andreyknvl@gmail.com Cc: 2023002089@link.tyut.edu.cn, akpm@linux-foundation.org, alexs@kernel.org, corbet@lwn.net, dvyukov@google.com, elver@google.com, glider@google.com, kasan-dev@googlegroups.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, ryabinin.a.a@gmail.com, siyanteng@loongson.cn, snovitoll@gmail.com, vincenzo.frascino@arm.com, workflows@vger.kernel.org Subject: [PATCH RESEND v3 1/3] kasan: move checks to do_strncpy_from_user Date: Mon, 14 Oct 2024 07:56:59 +0500 Message-Id: <20241014025701.3096253-2-snovitoll@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241014025701.3096253-1-snovitoll@gmail.com> References: <20241014025701.3096253-1-snovitoll@gmail.com> MIME-Version: 1.0 X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 0F1B84000C X-Stat-Signature: d91o7kbgjjm7jehqwzn8qz5emxffjiin X-Rspam-User: X-HE-Tag: 1728874558-699505 X-HE-Meta: U2FsdGVkX19CpvqSP7u4082QkTnmdmk1ocbQTzzp7GUTXmywz76nPI8xyoqPPfGxjZvXkxQZ9YrPgLn51pvfeuYOi64kPuddiz+pz/2/pSv5O6kCw6DoSOBMNUVAuF4yJVizmO037suXg8ONS0vXePFCLkfuZrNhuPPVpxOWlq207DuFZviDodTOtQwygqE935fRKAqPGnyKOSpz+2iTpCeCpbux+VngsgG+1vsBgP93wcQMVOP4MSRjO5UVJHYhlDy+OYq2KX0cTNU9AHbAqap/PXU7qYiqle0dMo/jSKWOwWhpfnSm9mwIU6XiAmyrjd+vM5wp0vE/+7oTbkY9+nIESYHh4X39+/lHEqaU6zY1rE2KB1Z87ivZrAnNvh8rSBzegeWYwPZLwdAPAEt99mTCNIEYj6SZezk+5VFEeQdV/PHN+8B7QHi4ZtU2pFhfctN3ISO5+Lo9thXa6b/OO2fl3buqfN3DOYaFsXJw8cp8JDyg02Vr8uvhDvCbntoCNNYtzTnFLKNyhW/+m3D7K/EMHOlCYcsNItpnAUl+nTnManfhj9JILfP9GcUGWcN4PxftlFKTR2VZrbtP9N0FquRbNKS15SoUp+/Q4e9H/m8CHpCAdGqAF9LTmUo2MEKmCOB/TrbAf3WKE8Pqp6TzuUEmOwozTZ2DNjdgJ2p/2um5OFQfXWPIXHD7R9CZrePTQkVGW30WHEFJ4UxaLVx6jJARZqYlP8BdHj98aPh7Kps7QxBEIUG8SQzDpmj96lWH6l4zfgnU9zgHxbsqWbrzUcGBj7FqI8HhoEt39Yz7HZmcCtPD9yghnGBpyg+/s9Nho40VezIQbLwzdeKWOw8PLsHHKD/Xoua9p4HQ3Yufln8j+u2qhbig57ahn2QKl1NAra2uub7kq+1Stix4Ndlw2oWnmeoGIHMtSD9QIjL8LdpM9OiR/VwZg8yU4KEVBQtOJ7f0kcraHltENqG2kN1 8gqC3qOE zP7Lqb9ECTBrypQVDjuPXGvjjTjAr8pgK+06AzRdXf8v4goGT76a3xiMGg4pi757JGWDdyL2boA9MRilpNJ7HLmKbFvF92YnVBxSzI6A8/6bbyT9pjJdgvA9iaVl7bmUgnXU/8KNl+lCfLaIWSuY559efz3369nWB4dSUQ9ANZ9BAZ0iz/oxDPitL1Z7QWXw1aWeyBjIAQeetszko44wMbndMeDQNRpoBL+lxpBb6soUYd2C0S/Ul4yDzmcTmxnhG7Soxl9Jp40Qxy5OjBxtkhZ854nZxIsuhd5b7nT/63TVPk7L8m79MgdwXAZYtfnwA7Ko5mYf20lf5uIshsQS9SskJVelkFSOpIG3w67zu4/K//PxQNVolgFOQ9FsT6D0iXdXhCEfR70mkyltqfK1l7fQieELchdMdt/r9hhNqxW9q9Gu6UsVXQfgcBTQ/UIDUB6/l9xElCLFog7oweS1kjqyDegYgEB7k1B7rHRDE23M/RA5J0wMZrT5gWw== 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: Since in the commit 2865baf54077("x86: support user address masking instead of non-speculative conditional") do_strncpy_from_user() is called from multiple places, we should sanitize the kernel *dst memory and size which were done in strncpy_from_user() previously. Fixes: 2865baf54077 ("x86: support user address masking instead of non-speculative conditional") Reviewed-by: Andrey Konovalov Signed-off-by: Sabyrzhan Tasbolatov --- lib/strncpy_from_user.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c index 989a12a6787..f36ad821176 100644 --- a/lib/strncpy_from_user.c +++ b/lib/strncpy_from_user.c @@ -31,6 +31,9 @@ static __always_inline long do_strncpy_from_user(char *dst, const char __user *s const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS; unsigned long res = 0; + kasan_check_write(dst, count); + check_object_size(dst, count, false); + if (IS_UNALIGNED(src, dst)) goto byte_at_a_time; @@ -142,8 +145,6 @@ long strncpy_from_user(char *dst, const char __user *src, long count) if (max > count) max = count; - kasan_check_write(dst, count); - check_object_size(dst, count, false); if (user_read_access_begin(src, max)) { retval = do_strncpy_from_user(dst, src, count, max); user_read_access_end(); From patchwork Mon Oct 14 02:57:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sabyrzhan Tasbolatov X-Patchwork-Id: 13834114 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 25176CF259F for ; Mon, 14 Oct 2024 02:56:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B28EF6B0093; Sun, 13 Oct 2024 22:56:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AD86B6B0095; Sun, 13 Oct 2024 22:56:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9A0ED6B0096; Sun, 13 Oct 2024 22:56:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 7D4606B0093 for ; Sun, 13 Oct 2024 22:56:46 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 4E5411A0AC2 for ; Mon, 14 Oct 2024 02:56:33 +0000 (UTC) X-FDA: 82670694918.20.A8608C6 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by imf20.hostedemail.com (Postfix) with ESMTP id A11461C0008 for ; Mon, 14 Oct 2024 02:56:37 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=ELEuC3C7; spf=pass (imf20.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.218.49 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=1728874462; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=/8xPPGnp2eNdFzyDsH77udpuxb5hGHHiKYVsaBBQcww=; b=7yH7wLyWf0rOVMRivneUSxeN6l/gQWxb3dNldxqeKhSvwGZXziVo7pdrL0oUuU/86qYlXP wXCBbDZJ5qIwxX5Lx3+dp6MxI2dHwvkwP9I0UeGQBKGfIgbWXy0Vu1SJ3oIyyPeWAPGGzz U57WSQQJxrkBPcC7xKiAeNWCjEPyVKU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728874462; a=rsa-sha256; cv=none; b=0uHgFzC3J+tcPwwuuUv2XgOVG9YjplaxsNFarGyRedARL1yRG7jncEEF9EM1Ooe6lckXqT Z4tHrg7zS1AigNWlaoIQT9GwqNEuOo4FqUAhv/coRzXawaa/i0ItP4avAIsh3yVQvzaYUR n6Ne98gp2m893vYJIA+g0gWg5gfyV9A= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=ELEuC3C7; spf=pass (imf20.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.218.49 as permitted sender) smtp.mailfrom=snovitoll@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-a99ffeea60bso138851166b.3 for ; Sun, 13 Oct 2024 19:56:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728874603; x=1729479403; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/8xPPGnp2eNdFzyDsH77udpuxb5hGHHiKYVsaBBQcww=; b=ELEuC3C7Ck0BQis0GOADCCAItqaCOesLsF8gcHLrbUtTiCgK7+Vcit9pvhMqITUpRi CzqP57wroQnMHgxQCpiiDHKiyEnGIPCQdLUrWWRBM6zCBomSTE79NMHdIc+m6Pe1Qwsl VFcIZS/FfHvlWiyjQAmj6Zr25QkHE9gvI9kc951abtuXpzrm9GX+9Hm1O/VBua453zKs qRiI6PXqPCpqodZqO8aNQ+5FQ9B40vPS4NTP7wwZ7nWVTQOCMczrZrshtEtwKvwEYiNG 530aSv07+DPU6mQjCkJR9iSprmthXeRrMclc5pWqD67hj+P2SSOISGgeI6ReWEoLVFhi r3ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728874603; x=1729479403; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/8xPPGnp2eNdFzyDsH77udpuxb5hGHHiKYVsaBBQcww=; b=AhvYNJ31h4G1qeEUPu7m0R+agjBHho6iaN5lYhIsid7kj8U8zJ3JMSOXMeHuH4OVZl 8PPCy/rS6Ih/pKDz/iApeeHMJOdeEWbouRM3sHYNz/S6jFV4eu3qJUY4ojGjr9WeIGWm reH22b8VpzFLJOlpRwgaUBJwtKX8wWaIWzHvscQMb9qZ6W6vV9p/fIJeN79hR+HN9otX 9SQRJfe0CRu0A5pfzVWVEaiN8Vy/6o/vPYmvm9Olpd0pmrWl9n8GyTb/zmWMNLjbf1+i 3fUsaENxvppI3WCv2uAP/sd8/zblGdNp+0Nm5GAfXNMFIqHmizHn2xq2778AQZnhTm00 T3nw== X-Forwarded-Encrypted: i=1; AJvYcCV7V9WrgDAXuxq9Ez05EPu0R60ksMVqSCBWAoyU4WT72330vLRzSNpvkLf+Wi9d8co8mg38574yZA==@kvack.org X-Gm-Message-State: AOJu0YzDEt6B9EjmjKHnUpXVvsX3+RlD+xECcKOajSxG8+F81XJPlz2k Dyw/+FLcCaZjRW0MtFJ8qT6OHxD/6ordTf8uwqsol9yP4NxzUZIF X-Google-Smtp-Source: AGHT+IGg2zTiSP9pkdThFwEPz88Rrc+thazAWWlSrFQkSIpC5/PWk+n9SRWCQsJl50F54xDsLVUSLg== X-Received: by 2002:a17:907:9488:b0:a9a:791:fb86 with SMTP id a640c23a62f3a-a9a0792046fmr282817966b.64.1728874602739; Sun, 13 Oct 2024 19:56:42 -0700 (PDT) Received: from work.. (2.133.25.254.dynamic.telecom.kz. [2.133.25.254]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a99ebdfbff1sm270501366b.39.2024.10.13.19.56.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Oct 2024 19:56:42 -0700 (PDT) From: Sabyrzhan Tasbolatov To: andreyknvl@gmail.com Cc: 2023002089@link.tyut.edu.cn, akpm@linux-foundation.org, alexs@kernel.org, corbet@lwn.net, dvyukov@google.com, elver@google.com, glider@google.com, kasan-dev@googlegroups.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, ryabinin.a.a@gmail.com, siyanteng@loongson.cn, snovitoll@gmail.com, vincenzo.frascino@arm.com, workflows@vger.kernel.org Subject: [PATCH RESEND v3 2/3] kasan: migrate copy_user_test to kunit Date: Mon, 14 Oct 2024 07:57:00 +0500 Message-Id: <20241014025701.3096253-3-snovitoll@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241014025701.3096253-1-snovitoll@gmail.com> References: <20241014025701.3096253-1-snovitoll@gmail.com> MIME-Version: 1.0 X-Stat-Signature: p3qqm4jkrcwwe4syhdbeh6yd3now3dic X-Rspamd-Queue-Id: A11461C0008 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1728874597-753393 X-HE-Meta: U2FsdGVkX18n42e53hs9hz+GDbZm8afOMqdqFe+BHnZBE466YaNypCnz8k9gQGhXgjJlLRCBH7K1vPMLFWFAggG5p/llxDtWkjcK9UhUeRVpnVpoCFYsX0Mfz0pSn5q/JBStVD1rAZl/18Mc+fbOWrWIxSTmR+EMvKG2qLdPY0RLCFOkvdDkN6flXbVBrmOG15OocRy18o5JcciYUWC+bEeYndlygcgKjOJDIyTEW+239y07TKYTkVJrZUgyymlPXYgZe+d6AfqOJ1efPIQVScaCIX+1ZVfX2+qWg1nkocohnaHiM35E+IPe9/ZyA0d2ghbAtTRog59VjroWbrtR80BT9c0CB4fy4ZQUbu62QsKFrTUEy6o3zDSRowDlTH9mGxW465mMncJv8hMNo11cD8lkw/KL6NvOt5QUmSj8inD5M3OQ5GWTcPzMjwn9502Auptybkwhs/xO7UqMQjHGOQcq95KBcJbDw3juRSVd3XeHPFo9TY4aDugsnKZ4641BSU9kx15o7XygjQg/X+3ZTIqxzx99m9jfGBfCne6MWe6sI8ImYJPzq1QgcfIqT50e3nqyn/4G02KNZ6+QG9PVrx/NRXMss5xkEnc6vOWdX2skMg1LVY/u2tLhKKjT/sESGhg1zxBbntYF+QOXwzgvdLva2R/8ON9QPxfWiyB46tdPqiSjrlf0nKirafIiRdJ7o+5nMuxYtB9BmEvV3r0u0O3+OcBZRcGj24CRm9wB9iAPz0oeKmzWt97xaQJIL46fle9YFdURZSKrTm0VO4lcCUl/fGJ9hdDZdIy0BqhBWMMJuQIFZLwllzJBcD1dzHjZ4EZ/lQ2YHb0bdFMsJ8Hs+BQwZqpfWBIKx9i1f+3f7tGbqB1XLD/988MLYBg3i37JsOS0YM+Mw+/mO2DjIs3ao19G+x+nN0Jqf2RohH9Bcm84pu16YzfxELSIVTGM4Krdq36A3MkgvfqVl/skrD5 Jjsi8WN9 ewGBufTjONenbfmkfjYSDsabIilT2e7/J8cXgB616cVggL3qVBkyAtk6OuPuaFvuqe9LhnJswrTBRa0jtDNu9/2z1BnYhVrY9+cyqd/dTXw50/IL8aHZGNZrGWV6qDpISd0X51FqY+vCBGctYHyezpN4xz2qIJu0y2NJuC3dJHCQKf0ngz/9VIph9DQ3uaadOUz7ZqPSVdUuw/f976iYFeXWihTqwEWc55ejXebX4QGzhX3LTm8qqFcroFBi8DemuCHkUQHI6jcWZnG4HwcHvVL/77qjX1CMYOJZJAN44yQ3d1ao3lNQHz9eHL+wFEFuqMAJ0bvLOsSGdbEI4f5FYUSVqgjm+xfP6AOb85XkKW/pVAorAfk69OiBcQfg+3U/EwSFBHJhavBnvbZK3ExBp8pBIoCNt2Fl2M9wXtk5S8aPRn5gDpvwW97u2v/7jBlU5uYnY+mrr4fmIQLc4YUCwmNACNmg/R+06Nvao7wojFDRfise9MGQNHsMRfZZtuvP8sdXa+BLuwjxf8MA= 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: 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. Reviewed-by: Andrey Konovalov Signed-off-by: Sabyrzhan Tasbolatov --- Changes v2 -> v3: - added a long string in usermem for strncpy_from_user. Suggested by Andrey. --- mm/kasan/Makefile | 2 - mm/kasan/kasan_test_c.c | 47 +++++++++++++++++++++ mm/kasan/kasan_test_module.c | 81 ------------------------------------ 3 files changed, 47 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 := $(CFLAGS_KASAN_TEST) RUSTFLAGS_kasan_test_rust.o := $(RUSTFLAGS_KASAN) -CFLAGS_kasan_test_module.o := $(CFLAGS_KASAN_TEST) obj-y := common.o report.o obj-$(CONFIG_KASAN_GENERIC) += init.o generic.o report_generic.o shadow.o quarantine.o @@ -59,4 +58,3 @@ ifdef CONFIG_RUST endif obj-$(CONFIG_KASAN_KUNIT_TEST) += kasan_test.o -obj-$(CONFIG_KASAN_MODULE_TEST) += kasan_test_module.o diff --git a/mm/kasan/kasan_test_c.c b/mm/kasan/kasan_test_c.c index a181e4780d9..382bc64e42d 100644 --- a/mm/kasan/kasan_test_c.c +++ b/mm/kasan/kasan_test_c.c @@ -1954,6 +1954,52 @@ 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 = 128 - KASAN_GRANULE_SIZE; + int __maybe_unused unused; + + kmem = kunit_kmalloc(test, size, GFP_KERNEL); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, kmem); + + useraddr = kunit_vm_mmap(test, NULL, 0, PAGE_SIZE, + PROT_READ | PROT_WRITE | PROT_EXEC, + 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 = (char __user *)useraddr; + + KUNIT_EXPECT_KASAN_FAIL(test, + unused = copy_from_user(kmem, usermem, size + 1)); + KUNIT_EXPECT_KASAN_FAIL(test, + unused = copy_to_user(usermem, kmem, size + 1)); + KUNIT_EXPECT_KASAN_FAIL(test, + unused = __copy_from_user(kmem, usermem, size + 1)); + KUNIT_EXPECT_KASAN_FAIL(test, + unused = __copy_to_user(usermem, kmem, size + 1)); + KUNIT_EXPECT_KASAN_FAIL(test, + unused = __copy_from_user_inatomic(kmem, usermem, size + 1)); + KUNIT_EXPECT_KASAN_FAIL(test, + unused = __copy_to_user_inatomic(usermem, kmem, size + 1)); + + /* + * 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); + + KUNIT_EXPECT_KASAN_FAIL(test, + unused = strncpy_from_user(kmem, usermem, size + 1)); +} + static struct kunit_case kasan_kunit_test_cases[] = { KUNIT_CASE(kmalloc_oob_right), KUNIT_CASE(kmalloc_oob_left), @@ -2028,6 +2074,7 @@ static struct kunit_case kasan_kunit_test_cases[] = { 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 = 128 - KASAN_GRANULE_SIZE; - int __maybe_unused unused; - - kmem = kmalloc(size, GFP_KERNEL); - if (!kmem) - return; - - usermem = (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 = copy_from_user(kmem, usermem, size + 1); - - pr_info("out-of-bounds in copy_to_user()\n"); - unused = copy_to_user(usermem, kmem, size + 1); - - pr_info("out-of-bounds in __copy_from_user()\n"); - unused = __copy_from_user(kmem, usermem, size + 1); - - pr_info("out-of-bounds in __copy_to_user()\n"); - unused = __copy_to_user(usermem, kmem, size + 1); - - pr_info("out-of-bounds in __copy_from_user_inatomic()\n"); - unused = __copy_from_user_inatomic(kmem, usermem, size + 1); - - pr_info("out-of-bounds in __copy_to_user_inatomic()\n"); - unused = __copy_to_user_inatomic(usermem, kmem, size + 1); - - pr_info("out-of-bounds in strncpy_from_user()\n"); - unused = 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 only - * report the first detected bug and panic the kernel if panic_on_warn - * is enabled. - */ - bool multishot = kasan_save_enable_multi_shot(); - - copy_user_test(); - - kasan_restore_multi_shot(multishot); - return -EAGAIN; -} - -module_init(kasan_test_module_init); -MODULE_LICENSE("GPL"); From patchwork Mon Oct 14 02:57:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sabyrzhan Tasbolatov X-Patchwork-Id: 13834115 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 F1C46CF259F for ; Mon, 14 Oct 2024 02:56:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 86ADD6B0096; Sun, 13 Oct 2024 22:56:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 81A516B0098; Sun, 13 Oct 2024 22:56:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 695776B0099; Sun, 13 Oct 2024 22:56:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 4A0776B0096 for ; Sun, 13 Oct 2024 22:56:50 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 56EB840AD4 for ; Mon, 14 Oct 2024 02:56:45 +0000 (UTC) X-FDA: 82670695128.08.43E9D4F Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by imf08.hostedemail.com (Postfix) with ESMTP id 0091A160005 for ; Mon, 14 Oct 2024 02:56:43 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="Ld/31hrx"; spf=pass (imf08.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.218.54 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=1728874467; 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=JGMf0QveJLuqNVGuhCQVRHmO+zBayTHS2lF5VIrEUbY=; b=btKdXMMYaHmDQk9dVqbNi6sIHjG8M5DF/bheX10AwuqOvSLo9bMYDxhaO3UO5+dGxZlJfM Yd+M8qX6MGSZCrhbZL6kNyskXQc5KuX5ki4SIpWE1EB6LkRgNInAJ/SmN7U2ZfItRNjH+7 5F2svjH/M4EmergVIvRgSdId6YxiSUY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728874467; a=rsa-sha256; cv=none; b=O56yJv2tiMYPgLAOasX8DZ6E23L0Of0yUe2utLtqzy4QelPnIoJKY5p0zY7HYmw2FxDpjs ZoHt7VDYydsyJem8hPn8WtvIGQ81p2izdLJhdDJjY6/xYq06ru0YJc+++bkt1NXeJsr3wD PoQIA2eJqehs+DfL+vZtLYs/mXOdPrI= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="Ld/31hrx"; spf=pass (imf08.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.218.54 as permitted sender) smtp.mailfrom=snovitoll@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-a9a0ef5179dso71908566b.1 for ; Sun, 13 Oct 2024 19:56:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728874606; x=1729479406; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JGMf0QveJLuqNVGuhCQVRHmO+zBayTHS2lF5VIrEUbY=; b=Ld/31hrx8Pm7/fcKedwiWsqnAX2j+/BwJJciQDfS4B20Ur0/6g/QpIHaV4HHTXHPw3 d0BDx556PnsThwK8lbueQf7XbuL6vV8YpeqNtDbA359EVsK0hzbKVTxrKQ+GPYxej8CM EXmXg4BCobwdrZUcyFuqr6sapt7r1OuOB5zyrr+gLJ5MCmXd4OV5JJpvBWlZufy+wBAT 5Q/nIr7iZLmI7J5lbRS+4FtKXfyzKnTLis9g04qL4xeWHt+mZhNiKrzTJAgnTbUy84uR O8BvcnBQi5raoO6JXLNJ3VZfT4SV12+gn/sIl5YnQtZI1AjLcYgL2Rd0GqtGBlCTJ+X/ hQNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728874606; x=1729479406; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JGMf0QveJLuqNVGuhCQVRHmO+zBayTHS2lF5VIrEUbY=; b=C96SetDIRz+nwd8UK1ktYwXgKBQWgsq07ORnY5H2+AEJFKqlOFAyI2f800zoS9ybU8 3LHYqI7xbep7I4F49RY+YOT04gmsPiwwNy9aw1qyJG1aTFF+6xqUTH9bskRVgDwPWYp6 YUcnW65eljcL/BO++4sFjhYBXLjGmOwfIkgAbQ0/748RhYhCFzjaMb12CukLlh+yea2K E8GGxb8yTK/h/uPo+9jMov+crywX/l1WLKcuY288y5UIM68pZQEXn1daYu2YlrXaPjd4 292HZj0lHZN72AqYmYztHH0r/AE0UCf44FCIA/ki1Uig4DBb9lEHhF9mJ7Bq0gVqJ8jR JgeQ== X-Forwarded-Encrypted: i=1; AJvYcCXp3Ey2nAGKeqxtKDxRjhFjJrMl2xJFxqaHxlBDMok0mDtwDScnH8lHiRbzNDIhyRLMzNqGDEC+qA==@kvack.org X-Gm-Message-State: AOJu0YyQn0agumTCYSoPEzwZIADUGQ22Foyxs8ISSeKT1IC9Jbwef7UQ +6RQnAt2iQELsBkVJLOBj+xkuayxYgLaHskQA1PinsQvYmWIeHq6 X-Google-Smtp-Source: AGHT+IGlDB8KlTXo7DMjdLaANmivxjxlnYDmQ0l9WvS8pEmuPKYpnSfmCvDI08URAXjBlRXZF+7cEQ== X-Received: by 2002:a17:907:72c1:b0:a9a:17f5:79a8 with SMTP id a640c23a62f3a-a9a17f59d0bmr26163766b.13.1728874606156; Sun, 13 Oct 2024 19:56:46 -0700 (PDT) Received: from work.. (2.133.25.254.dynamic.telecom.kz. [2.133.25.254]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a99ebdfbff1sm270501366b.39.2024.10.13.19.56.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Oct 2024 19:56:45 -0700 (PDT) From: Sabyrzhan Tasbolatov To: andreyknvl@gmail.com Cc: 2023002089@link.tyut.edu.cn, akpm@linux-foundation.org, alexs@kernel.org, corbet@lwn.net, dvyukov@google.com, elver@google.com, glider@google.com, kasan-dev@googlegroups.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, ryabinin.a.a@gmail.com, siyanteng@loongson.cn, snovitoll@gmail.com, vincenzo.frascino@arm.com, workflows@vger.kernel.org Subject: [PATCH RESEND v3 3/3] kasan: delete CONFIG_KASAN_MODULE_TEST Date: Mon, 14 Oct 2024 07:57:01 +0500 Message-Id: <20241014025701.3096253-4-snovitoll@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241014025701.3096253-1-snovitoll@gmail.com> References: <20241014025701.3096253-1-snovitoll@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 0091A160005 X-Stat-Signature: wyxhi4irtioqitmkkqq7sz3gk9o836d3 X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1728874603-4731 X-HE-Meta: U2FsdGVkX1+ce/2STFKLkO9qHXy4TVfPafv1yHELFcDEnagRLMc/c6L67q7ffu5kdQaQ2sP61zz3Zqms3C7kxzYqqz/NnhPs+A599gNNIU2nxvwjZkeOthSj8BEz63bXxKZPF0Z9CcIe4jBhs6cw5QHV5WdFnoRGOMfxV9UV7BsxpEQCrgc/6Nq/ojXYsgD5DXHuAab8z5wuu20QZTLM+1uxiYqc7rZXL1WnkzJZHHIMWdu4IG3m6A/RlzEc1ShLPK+fBCvVr7IxXMAmKGdlTV4grnd6xEe0xEkEPg7FoCYGSanwhVaH+3m5sbZw+oYxW6B1WsDgY+Y5hoP9GK27WfT2v04puk0Bq0UxZ00rErkDKyZ7ojvo3XOoQPeWIl/O/WbasCOrkkt//FGsvASmkB4W/Ciqo5z0G1mN9qHWrx8RX47P/XVzU/3HzvqW27Bv+EBPKTbde+KFZRlKa3P6EwDsE88aVPyF2wqkhd3UmT4IlHRB1ONO4pOwecy3IpqqgqSv3mgx3tAJbbEF3/WeAG7vuCTd3ZBxqgToshcS3EfBwmBvQcjsW/Y6XbfpuXxtxa8EYGyZvKeeYzS1Mwok586zqaYqDoXDk6iFvyZpl8UYUn6P0OmIswumqeDDT1xfCZ9Cmefqas0tFtdVXD7CoG6vuLGBSTcgyGDYslhl7zbJZNe1O3LqoLNATdyrqtEWHcSCFIP//REmrXnewnElr8WyZz1N4Db0mBMONbDtf+bvndoL0/wcW30e151Z7SfKZjMqXkNuix1JnZhhKvtHv+3ayzcK1mxqkikZYAGVmmAR4FxWYpTdHcN9cG3cpbw8tyGmdxoJQhsLmT0LUUdhoxFdPquPD2fmcgz9GojbUMzLxsibM3xz0KPd07U0dX+LzvwdFdTpyCDnELWqJ9SFnLeMZs3a0iPcMxkCVrzKsuvlXzVTxJlFrwwlXEbfgfQrZorbdJx3Mkoyhu2kI6E eUqJTpb6 pTThppqCYx525ELlerKW7mnBN3J4j9VZOS7z7wH0/YLU7apuuuVGPwIYSY056931hKmCg2tUfe+tcmQmsFM+jEoaLvYe8s00JxzBTRVYE7RnT2c+RPfbdoPAUUhPUA51acnPhIhcpD1dpRSoLezihoqsyc7iB4xV5kM6ifofWz1iR/7HJ7NQf9SUA78TqMol8IvAs1OazBHMh1JtpDD1SohjWS8wTWIhMDFqO3iQFzUOxI5X6FhjGdsY/NgSDiA918rciZBXoqRZLOg0fM8jDPdI+k5X1yzQP/YvD1TGS08LLqAId8oyhvkwKejeaO72gjhrPbKAC1LuquXjCuf0oM1BLjJD3bQWFTeCUk84bm1THbUp11X2c6OMm8cs92cDcVfPltaJjS1GqqFZmt/RIFIBzp8LEer0OLVs29E6z3JQYZoXk7wb0oMZ9cbuxW/Ws8Vi6YlPHEZwr9iYYiJy3N2eSdkYlxaEGEJddQHwLGclABCpHpcnYFf7umyasB09jFnAWbQRQl4a9zRzzIf1ucQWKgw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000368, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Since we've migrated all tests to the KUnit framework, we can delete CONFIG_KASAN_MODULE_TEST and mentioning of it in the documentation as well. I've used the online translator to modify the non-English documentation. Reviewed-by: Andrey Konovalov Signed-off-by: Sabyrzhan Tasbolatov --- Changes v2 -> v3: - applied Andrey's patch to modify further kasan.rst. --- Documentation/dev-tools/kasan.rst | 23 ++++++++----------- .../translations/zh_CN/dev-tools/kasan.rst | 20 +++++++--------- .../translations/zh_TW/dev-tools/kasan.rst | 21 ++++++++--------- lib/Kconfig.kasan | 7 ------ mm/kasan/kasan.h | 2 +- mm/kasan/report.c | 2 +- 6 files changed, 28 insertions(+), 47 deletions(-) diff --git a/Documentation/dev-tools/kasan.rst b/Documentation/dev-tools/kasan.rst index d7de44f5339..0a1418ab72f 100644 --- a/Documentation/dev-tools/kasan.rst +++ b/Documentation/dev-tools/kasan.rst @@ -511,19 +511,14 @@ Tests ~~~~~ There are KASAN tests that allow verifying that KASAN works and can detect -certain types of memory corruptions. The tests consist of two parts: +certain types of memory corruptions. -1. Tests that are integrated with the KUnit Test Framework. Enabled with -``CONFIG_KASAN_KUNIT_TEST``. These tests can be run and partially verified +All KASAN tests are integrated with the KUnit Test Framework and can be enabled +via ``CONFIG_KASAN_KUNIT_TEST``. The tests can be run and partially verified automatically in a few different ways; see the instructions below. -2. Tests that are currently incompatible with KUnit. Enabled with -``CONFIG_KASAN_MODULE_TEST`` and can only be run as a module. These tests can -only be verified manually by loading the kernel module and inspecting the -kernel log for KASAN reports. - -Each KUnit-compatible KASAN test prints one of multiple KASAN reports if an -error is detected. Then the test prints its number and status. +Each KASAN test prints one of multiple KASAN reports if an error is detected. +Then the test prints its number and status. When a test passes:: @@ -550,16 +545,16 @@ Or, if one of the tests failed:: not ok 1 - kasan -There are a few ways to run KUnit-compatible KASAN tests. +There are a few ways to run the KASAN tests. 1. Loadable module - With ``CONFIG_KUNIT`` enabled, KASAN-KUnit tests can be built as a loadable - module and run by loading ``kasan_test.ko`` with ``insmod`` or ``modprobe``. + With ``CONFIG_KUNIT`` enabled, the tests can be built as a loadable module + and run by loading ``kasan_test.ko`` with ``insmod`` or ``modprobe``. 2. Built-In - With ``CONFIG_KUNIT`` built-in, KASAN-KUnit tests can be built-in as well. + With ``CONFIG_KUNIT`` built-in, the tests can be built-in as well. In this case, the tests will run at boot as a late-init call. 3. Using kunit_tool diff --git a/Documentation/translations/zh_CN/dev-tools/kasan.rst b/Documentation/translations/zh_CN/dev-tools/kasan.rst index 4491ad2830e..fd2e3afbdfa 100644 --- a/Documentation/translations/zh_CN/dev-tools/kasan.rst +++ b/Documentation/translations/zh_CN/dev-tools/kasan.rst @@ -422,16 +422,12 @@ KASAN连接到vmap基础架构以懒清理未使用的影子内存。 ~~~~ 有一些KASAN测试可以验证KASAN是否正常工作并可以检测某些类型的内存损坏。 -测试由两部分组成: -1. 与KUnit测试框架集成的测试。使用 ``CONFIG_KASAN_KUNIT_TEST`` 启用。 -这些测试可以通过几种不同的方式自动运行和部分验证；请参阅下面的说明。 +所有 KASAN 测试都与 KUnit 测试框架集成，可通过 ``CONFIG_KASAN_KUNIT_TEST`` 启用。 +测试可以通过几种不同的方式自动运行和部分验证；请参阅以下说明。 -2. 与KUnit不兼容的测试。使用 ``CONFIG_KASAN_MODULE_TEST`` 启用并且只能作为模块 -运行。这些测试只能通过加载内核模块并检查内核日志以获取KASAN报告来手动验证。 - -如果检测到错误，每个KUnit兼容的KASAN测试都会打印多个KASAN报告之一，然后测试打印 -其编号和状态。 +如果检测到错误，每个 KASAN 测试都会打印多份 KASAN 报告中的一份。 +然后测试会打印其编号和状态。 当测试通过:: @@ -458,16 +454,16 @@ KASAN连接到vmap基础架构以懒清理未使用的影子内存。 not ok 1 - kasan -有几种方法可以运行与KUnit兼容的KASAN测试。 +有几种方法可以运行 KASAN 测试。 1. 可加载模块 - 启用 ``CONFIG_KUNIT`` 后，KASAN-KUnit测试可以构建为可加载模块，并通过使用 - ``insmod`` 或 ``modprobe`` 加载 ``kasan_test.ko`` 来运行。 + 启用 ``CONFIG_KUNIT`` 后，可以将测试构建为可加载模块 + 并通过使用 ``insmod`` 或 ``modprobe`` 加载 ``kasan_test.ko`` 来运行。 2. 内置 - 通过内置 ``CONFIG_KUNIT`` ，也可以内置KASAN-KUnit测试。在这种情况下， + 通过内置 ``CONFIG_KUNIT``，测试也可以内置。 测试将在启动时作为后期初始化调用运行。 3. 使用kunit_tool diff --git a/Documentation/translations/zh_TW/dev-tools/kasan.rst b/Documentation/translations/zh_TW/dev-tools/kasan.rst index ed342e67d8e..35b7fd18aa4 100644 --- a/Documentation/translations/zh_TW/dev-tools/kasan.rst +++ b/Documentation/translations/zh_TW/dev-tools/kasan.rst @@ -404,16 +404,13 @@ KASAN連接到vmap基礎架構以懶清理未使用的影子內存。 ~~~~ 有一些KASAN測試可以驗證KASAN是否正常工作並可以檢測某些類型的內存損壞。 -測試由兩部分組成: -1. 與KUnit測試框架集成的測試。使用 ``CONFIG_KASAN_KUNIT_TEST`` 啓用。 -這些測試可以通過幾種不同的方式自動運行和部分驗證；請參閱下面的說明。 +所有 KASAN 測試均與 KUnit 測試框架集成，並且可以啟用 +透過 ``CONFIG_KASAN_KUNIT_TEST``。可以運行測試並進行部分驗證 + 以幾種不同的方式自動進行；請參閱下面的說明。 -2. 與KUnit不兼容的測試。使用 ``CONFIG_KASAN_MODULE_TEST`` 啓用並且只能作爲模塊 -運行。這些測試只能通過加載內核模塊並檢查內核日誌以獲取KASAN報告來手動驗證。 - -如果檢測到錯誤，每個KUnit兼容的KASAN測試都會打印多個KASAN報告之一，然後測試打印 -其編號和狀態。 +如果偵測到錯誤，每個 KASAN 測試都會列印多個 KASAN 報告之一。 +然後測試列印其編號和狀態。 當測試通過:: @@ -440,16 +437,16 @@ KASAN連接到vmap基礎架構以懶清理未使用的影子內存。 not ok 1 - kasan -有幾種方法可以運行與KUnit兼容的KASAN測試。 +有幾種方法可以執行 KASAN 測試。 1. 可加載模塊 - 啓用 ``CONFIG_KUNIT`` 後，KASAN-KUnit測試可以構建爲可加載模塊，並通過使用 - ``insmod`` 或 ``modprobe`` 加載 ``kasan_test.ko`` 來運行。 + 啟用 ``CONFIG_KUNIT`` 後，測試可以建置為可載入模組 + 並且透過使用 ``insmod`` 或 ``modprobe`` 來載入 ``kasan_test.ko`` 來運作。 2. 內置 - 通過內置 ``CONFIG_KUNIT`` ，也可以內置KASAN-KUnit測試。在這種情況下， + 透過內建 ``CONFIG_KUNIT``，測試也可以內建。 測試將在啓動時作爲後期初始化調用運行。 3. 使用kunit_tool diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan index 98016e137b7..f82889a830f 100644 --- a/lib/Kconfig.kasan +++ b/lib/Kconfig.kasan @@ -195,13 +195,6 @@ config KASAN_KUNIT_TEST For more information on KUnit and unit tests in general, please refer to the KUnit documentation in Documentation/dev-tools/kunit/. -config KASAN_MODULE_TEST - tristate "KUnit-incompatible tests of KASAN bug detection capabilities" - depends on m && KASAN && !KASAN_HW_TAGS - help - A part of the KASAN test suite that is not integrated with KUnit. - Incompatible with Hardware Tag-Based KASAN. - config KASAN_EXTRA_INFO bool "Record and report more information" depends on KASAN diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index f438a6cdc96..b7e4b81421b 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -568,7 +568,7 @@ static inline void kasan_kunit_test_suite_end(void) { } #endif /* CONFIG_KASAN_KUNIT_TEST */ -#if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST) || IS_ENABLED(CONFIG_KASAN_MODULE_TEST) +#if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST) bool kasan_save_enable_multi_shot(void); void kasan_restore_multi_shot(bool enabled); diff --git a/mm/kasan/report.c b/mm/kasan/report.c index b48c768acc8..3e48668c3e4 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -132,7 +132,7 @@ static bool report_enabled(void) return !test_and_set_bit(KASAN_BIT_REPORTED, &kasan_flags); } -#if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST) || IS_ENABLED(CONFIG_KASAN_MODULE_TEST) +#if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST) bool kasan_save_enable_multi_shot(void) {