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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5CE27CAC598 for ; Tue, 16 Sep 2025 09:01:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5D9E28E0013; Tue, 16 Sep 2025 05:01:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 586828E0001; Tue, 16 Sep 2025 05:01:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 33E098E0013; Tue, 16 Sep 2025 05:01:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 18B558E0001 for ; Tue, 16 Sep 2025 05:01:26 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id E16A61A085F for ; Tue, 16 Sep 2025 09:01:25 +0000 (UTC) X-FDA: 83894519730.21.C160A21 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by imf08.hostedemail.com (Postfix) with ESMTP id DC942160002 for ; Tue, 16 Sep 2025 09:01:23 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=AWzxViVa; spf=pass (imf08.hostedemail.com: domain of ethan.w.s.graham@gmail.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=ethan.w.s.graham@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=1758013284; 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=wAOqPYvSWVeN9/yE7pImb3Dnjd/YBm0aGHPiEL/y/Dw=; b=4I08cBJMZxrqpUayFMikaAQCYM/Nn2z21VhQaUbLWDLD8IDCd7qlrekWik4E+B+aPwzQUt AFv5zH5NBa0cwEz45RvsH+F3Er1roVzb1nXs87lfAzGpwMa5OBBMC2jNpXMFn1ZhSpZq/O UfWi8jTKHMC5RHEEjRsXMhdIKN2Nmdc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1758013284; a=rsa-sha256; cv=none; b=Si224xdVMemSvsIekFf941qwbo/XYJo3aM2RvJ8/XfwLXiYV5b6B0OUpL+jE913l2SKaEV SqPYWSLtvZ59zIosik9UHpT+Jfmd2myEckziCDDRTl9wsCfEPYjrqR+FxbaxgqCLA/p5I8 CH2GEdNo0k3psVInAOTfxDb4Jfh2XJM= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=AWzxViVa; spf=pass (imf08.hostedemail.com: domain of ethan.w.s.graham@gmail.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=ethan.w.s.graham@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-3c6abcfd142so2527588f8f.2 for ; Tue, 16 Sep 2025 02:01:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758013282; x=1758618082; 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=wAOqPYvSWVeN9/yE7pImb3Dnjd/YBm0aGHPiEL/y/Dw=; b=AWzxViVa7z7tNk/TwoDg2+tA7gbr0VPyJ7SYB6WzyKLtRi7UFFKnPOebhDzePPCegg ZSTUEPenGqR6xfeF4BIvUIGem2GNJREukNVJth/oibGvIY3BPNtKJ5syp6brLULyCq8k 2mPf0A7imjl9T7TyCvrZHXkrCg40laL+rFLY6prrfI1OskU04dgX8CLU4Gxg/coCOBnk uNUZJZsyfTfCfke6RK3/yJGVys8DUebVe8hn4Z7pIB86h30elUILuhpopojY8dr6NWgt qVmiMAv1Cq3SscAzuRNI1D3W2wB6YCNfyXZRSNoETGdz/7X+YxdZXohDwOMilvQgr8qU OyOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758013282; x=1758618082; 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=wAOqPYvSWVeN9/yE7pImb3Dnjd/YBm0aGHPiEL/y/Dw=; b=BwAeKP7i6jD5Xe+ehJf5LJ+ZktMwfcOVrHpwkeW5F7vTZqDv4y+HXhg5eaFDkkoK0e cjvSeyliS+ZVh4R6DR4fS7vSx7Mriu+iW1zBXP5SQQG3YbZG6QCCvVreS4dd9umh1KAq 6UKx7l8AMvELPdoQBrCvqrN4ul4ehNC1KLcrsWsOpwIGaDTOUDsCe2sVbG2PVqgp9ej2 cBJuNtDcRoa4IlBotUByxl30Rmaz920z32NFZ5WD0gJ9MABAOuOL/e3PeZ7vGzKZDH5w ruYOo2b7uz/7Mh+IGmSH9ZlFAZkpaqd7lVLvAndYB7+CzBZUoU3hqFA7q3kzmldHK4NP m/CQ== X-Forwarded-Encrypted: i=1; AJvYcCWHVXTUMLPTimq5wnCTvqFDc5i+nQ6eNxC1eMcab7+mD0W9wGNcA9eXaLEw3mwKbqxiNoz/h/Ctzw==@kvack.org X-Gm-Message-State: AOJu0YyvIfq3BXegUU3mFOWITgN7JaPFXwbNDkz9CsDjGdYU8RopdFDM 3Xgjg2xFPe2ATJJj4coloyctcHdyU/a0ZIx4j+NYqA9Uy/8QLbOaaFMX X-Gm-Gg: ASbGnctK8OUJdBhzg5GAO0iiMvxsgC3HEiCNnzBhJ83/zUDWeamnag4j9lCqdEW65Hl 1KoZ5oul8zidWyuOVIsxuBSRSXt0ETXOnpSXJEvruWEAWmSvbExbU9Olm5gmpZb6YfKR0G6pQ8W 3UQxJCc9Y5AmX+itxA9SbnOnVInYuzzcY0tYK3TAzRmhAxvMDZSYMQ+3m06D3BlrlZsGDh1kP4l S2aYIzDo4INJPo84aRkmCF2YUkFL2bbBiJESIdD6jmI8igR00k+vZIIcyF9bi61apKjzp2n1cox vgfEYnL0PIDteL9S+dm8fwFd6P75yCp/Ip3dOhEzcd3Ul5HpVVUl3NVUjsA3nW4Tf3/ndU9OsOA 9H7WlyKXo7Rv/IoRYDrKDo6+z+ZKOiflfu7xhCBhMAQ2BxA4B+vYv0sQyJmXeBECspvtXTwO4iJ sz0hcjCGZyhkLi X-Google-Smtp-Source: AGHT+IFaIHSJprd+d+0qq0jjdQAZm5Tx31BeDOIeQBVXABUXuuSsnl2Hqjdm092XL0xM7tasNHavOw== X-Received: by 2002:a5d:5f53:0:b0:3ec:9a32:3642 with SMTP id ffacd0b85a97d-3ec9a323866mr1190593f8f.62.1758013281461; Tue, 16 Sep 2025 02:01:21 -0700 (PDT) Received: from xl-nested.c.googlers.com.com (42.16.79.34.bc.googleusercontent.com. [34.79.16.42]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45e037186e5sm212975035e9.5.2025.09.16.02.01.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Sep 2025 02:01:20 -0700 (PDT) From: Ethan Graham To: ethangraham@google.com, glider@google.com Cc: andreyknvl@gmail.com, andy@kernel.org, brauner@kernel.org, brendan.higgins@linux.dev, davem@davemloft.net, davidgow@google.com, dhowells@redhat.com, dvyukov@google.com, elver@google.com, herbert@gondor.apana.org.au, ignat@cloudflare.com, jack@suse.cz, jannh@google.com, johannes@sipsolutions.net, kasan-dev@googlegroups.com, kees@kernel.org, kunit-dev@googlegroups.com, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, lukas@wunner.de, rmoar@google.com, shuah@kernel.org, tarasmadan@google.com Subject: [PATCH v1 03/10] kfuzztest: implement core module and input processing Date: Tue, 16 Sep 2025 09:01:02 +0000 Message-ID: <20250916090109.91132-4-ethan.w.s.graham@gmail.com> X-Mailer: git-send-email 2.51.0.384.g4c02a37b29-goog In-Reply-To: <20250916090109.91132-1-ethan.w.s.graham@gmail.com> References: <20250916090109.91132-1-ethan.w.s.graham@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: gieyqsyg3qmpp1m754wk6o6bncj5kzy4 X-Rspam-User: X-Rspamd-Queue-Id: DC942160002 X-Rspamd-Server: rspam10 X-HE-Tag: 1758013283-446907 X-HE-Meta: U2FsdGVkX19qRx0P0IOhUFFtwPGnog6S/rFDOhd5VuuixctMgSurOfCwvnxyEIbRACnDMPAQdjXh8Ix2RyjzcrFTqp3l6HdRJMhCJ2AisBs/PgjL/JcIlgnmdBOx4pRjElhrbT5O1tGmwYl/uTvkYPkFjQ6ExV+74EOHZQOSZQdTnurJBmmFN/d1tfuS0bkIwJTNV1GMXvKQAmB38k14CBlYiIi54+YEh27pAl0ZYSY24hFUUgjwVAHwJvl0/UUcKeo+fZgX9mLN51yxRIpeTBWbyFZ77gP4Vz+/qWQ+WmTxaimlUuxZ5RmlP8z0D77nYQcHT/7YvL7K2WxibaJpGb9IU2XbUnT9zzcVI2kH2gVfZ8nW9/ivm6i6xp8kYWMPOwyubh3kcLmzT9zhIxE8RXFW0IXr60n6ncS/IJBTSi9HAaw1TNEh+Yy6wJ1hQKbj8P3SssY+xN/m9X+Yd4jvtIRwo7vcrAgbPLV/ipOUNRV7cg7Ff9EwPtElEZaTpyM9KPDnWn2reOSLyo90WHLGBa29d3UGYJPTZoJW/0c2JCqB0/33V1XZuLoLFxJx0kbnavEsKKUCXotjq4HytQuzuAJv8odWIJy64gknnyYZh2l4I/T+IR6EthoNDju+HTUyaIEPGDMo9mJlYfMTPC9NnwcNPTkSAu1IeRnFntj1Chw7uZAeGQo9gX0ak7oPw0V9Uuudjnh6bY0X/S6NxD6t76RrM60105RGJylHyaDmi31u/vyBm9C93gP8oDy7Akvd7+lAbQg8VUJ5cWz0i9V5WkWv6IvK4mhJ4cqMWG9Cd3uZxS9RHGhW4qhH4gsNIsm/R0T4Wal1DB7BA6w7qLD+l9+3WztREpt+Csz9tRzdxSATBkbTgQByy7/lSYa4ixl8kIoZglnIrKXGab8q02z6CKzb6XBFXEgdXpP5XADsaXsQ6b2DwKKNd0Ybqzm+lB9pla3x2XiWRI5GE6zdEI+ 2H6MiY6/ paqCH/iA8O0ZHgycXab4f7lp54y6+TJ0GTWAu2nrR+9utlGIrdMgxkiCqfBNy4qOhzfMMfvxOkgCqG3v0OexEEBB2wfGGOF/8sHQ6tcntuFBLaa/XmDnZCpesuHypp38LSi94BgVtSZwWh8T/4DeoHFNHwVOkjEWTvNt0aKC4yQKujGPu8hesRdYTgwG7P21nNxdsv0HR1nERFEx9wXrTWxkLvn3Gnhng7unEfPpsqow0CT3oDQzsCXdTcOq1rr/lg6QK6wsSg4FFIvKegiwfO6sCuOHdFvRbc3q5rzFY836HPXXV7nLdcGbMauftKpZV0woVbrn0NBApo9AYeBnX1BOQchDmd5gUw32RKfrldxgtWVvzocPF2lpoWRH51P+Rs8TaEci3Z5sRYkpmjDLoPmppx8KMu7xbq/9FVr/dbDHVMLGRiidFwZ7QkpjSPs+nPRUh 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: From: Ethan Graham Add the core runtime implementation for KFuzzTest. This includes the module initialization, and the logic for receiving and processing user-provided inputs through debugfs. On module load, the framework discovers all test targets by iterating over the .kfuzztest_target section, creating a corresponding debugfs directory with a write-only 'input' file for each of them. Writing to an 'input' file triggers the main fuzzing sequence: 1. The serialized input is copied from userspace into a kernel buffer. 2. The buffer is parsed to validate the region array and relocation table. 3. Pointers are patched based on the relocation entries, and in KASAN builds the inter-region padding is poisoned. 4. The resulting struct is passed to the user-defined test logic. Signed-off-by: Ethan Graham --- v3: - Update kfuzztest/parse.c interfaces to take `unsigned char *` instead of `void *`, reducing the number of pointer casts. - Expose minimum region alignment via a new debugfs file. - Expose number of successful invocations via a new debugfs file. - Refactor module init function, add _config directory with entries containing KFuzzTest state information. - Account for kasan_poison_range() return value in input parsing logic. - Validate alignment of payload end. - Move static sizeof assertions into /lib/kfuzztest/main.c. - Remove the taint in kfuzztest/main.c. We instead taint the kernel as soon as a fuzz test is invoked for the first time, which is done in the primary FUZZ_TEST macro. v2: - The module's init function now taints the kernel with TAINT_TEST. --- --- include/linux/kfuzztest.h | 4 + lib/Makefile | 2 + lib/kfuzztest/Makefile | 4 + lib/kfuzztest/main.c | 240 ++++++++++++++++++++++++++++++++++++++ lib/kfuzztest/parse.c | 204 ++++++++++++++++++++++++++++++++ 5 files changed, 454 insertions(+) create mode 100644 lib/kfuzztest/Makefile create mode 100644 lib/kfuzztest/main.c create mode 100644 lib/kfuzztest/parse.c diff --git a/include/linux/kfuzztest.h b/include/linux/kfuzztest.h index 1e5ed517f291..d90dabba23c4 100644 --- a/include/linux/kfuzztest.h +++ b/include/linux/kfuzztest.h @@ -150,6 +150,9 @@ struct kfuzztest_target { #define KFUZZTEST_MAX_INPUT_SIZE (PAGE_SIZE * 16) +/* Increments a global counter after a successful invocation. */ +void record_invocation(void); + /** * FUZZ_TEST - defines a KFuzzTest target * @@ -243,6 +246,7 @@ struct kfuzztest_target { if (ret < 0) \ goto out; \ kfuzztest_logic_##test_name(arg); \ + record_invocation(); \ ret = len; \ out: \ kfree(buffer); \ diff --git a/lib/Makefile b/lib/Makefile index 392ff808c9b9..02789bf88499 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -325,6 +325,8 @@ obj-$(CONFIG_GENERIC_LIB_CMPDI2) += cmpdi2.o obj-$(CONFIG_GENERIC_LIB_UCMPDI2) += ucmpdi2.o obj-$(CONFIG_OBJAGG) += objagg.o +obj-$(CONFIG_KFUZZTEST) += kfuzztest/ + # pldmfw library obj-$(CONFIG_PLDMFW) += pldmfw/ diff --git a/lib/kfuzztest/Makefile b/lib/kfuzztest/Makefile new file mode 100644 index 000000000000..142d16007eea --- /dev/null +++ b/lib/kfuzztest/Makefile @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_KFUZZTEST) += kfuzztest.o +kfuzztest-objs := main.o parse.o diff --git a/lib/kfuzztest/main.c b/lib/kfuzztest/main.c new file mode 100644 index 000000000000..06f4e3c3c9b2 --- /dev/null +++ b/lib/kfuzztest/main.c @@ -0,0 +1,240 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * KFuzzTest core module initialization and debugfs interface. + * + * Copyright 2025 Google LLC + */ +#include +#include +#include +#include +#include +#include +#include + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Ethan Graham "); +MODULE_DESCRIPTION("Kernel Fuzz Testing Framework (KFuzzTest)"); + +/* + * Enforce a fixed struct size to ensure a consistent stride when iterating over + * the array of these structs in the dedicated ELF section. + */ +static_assert(sizeof(struct kfuzztest_target) == 32, "struct kfuzztest_target should have size 32"); +static_assert(sizeof(struct kfuzztest_constraint) == 64, "struct kfuzztest_constraint should have size 64"); +static_assert(sizeof(struct kfuzztest_annotation) == 32, "struct kfuzztest_annotation should have size 32"); + +extern const struct kfuzztest_target __kfuzztest_targets_start[]; +extern const struct kfuzztest_target __kfuzztest_targets_end[]; + +/** + * struct kfuzztest_state - global state for the KFuzzTest module + * + * @kfuzztest_dir: The root debugfs directory, /sys/kernel/debug/kfuzztest/. + * @num_targets: number of registered KFuzzTest targets. + * @target_fops: array of file operations for each registered target. + * @minalign_fops: file operations for the /_config/minalign file. + * @num_invocations_fops: file operations for the /_config/num_invocations file. + */ +struct kfuzztest_state { + struct dentry *kfuzztest_dir; + atomic_t num_invocations; + size_t num_targets; + + struct file_operations *target_fops; + struct file_operations minalign_fops; + struct file_operations num_invocations_fops; +}; + +static struct kfuzztest_state state; + +void record_invocation(void) +{ + atomic_inc(&state.num_invocations); +} + +static void cleanup_kfuzztest_state(struct kfuzztest_state *st) +{ + debugfs_remove_recursive(st->kfuzztest_dir); + st->num_targets = 0; + st->num_invocations = (atomic_t)ATOMIC_INIT(0); + kfree(st->target_fops); + st->target_fops = NULL; +} + +const umode_t KFUZZTEST_INPUT_PERMS = 0222; +const umode_t KFUZZTEST_MINALIGN_PERMS = 0444; + +static ssize_t read_cb_integer(struct file *filp, char __user *buf, size_t count, loff_t *f_pos, size_t value) +{ + char buffer[64]; + int len; + + len = scnprintf(buffer, sizeof(buffer), "%zu\n", value); + return simple_read_from_buffer(buf, count, f_pos, buffer, len); +} + +/* + * Callback for /sys/kernel/debug/kfuzztest/_config/minalign. Minalign + * corresponds to the minimum alignment that regions in a KFuzzTest input must + * satisfy. This callback returns that value in string format. + */ +static ssize_t minalign_read_cb(struct file *filp, char __user *buf, size_t count, loff_t *f_pos) +{ + int minalign = MAX(KFUZZTEST_POISON_SIZE, ARCH_KMALLOC_MINALIGN); + return read_cb_integer(filp, buf, count, f_pos, minalign); +} + +/* + * Callback for /sys/kernel/debug/kfuzztest/_config/num_targets, which returns + * the value in string format. + */ +static ssize_t num_invocations_read_cb(struct file *filp, char __user *buf, size_t count, loff_t *f_pos) +{ + return read_cb_integer(filp, buf, count, f_pos, atomic_read(&state.num_invocations)); +} + +static int create_read_only_file(struct dentry *parent, const char *name, struct file_operations *fops) +{ + struct dentry *file; + int err = 0; + + file = debugfs_create_file(name, KFUZZTEST_MINALIGN_PERMS, parent, NULL, fops); + if (!file) + err = -ENOMEM; + else if (IS_ERR(file)) + err = PTR_ERR(file); + return err; +} + +static int initialize_config_dir(struct kfuzztest_state *st) +{ + struct dentry *dir; + int err = 0; + + dir = debugfs_create_dir("_config", st->kfuzztest_dir); + if (!dir) + err = -ENOMEM; + else if (IS_ERR(dir)) + err = PTR_ERR(dir); + if (err) { + pr_info("kfuzztest: failed to create /_config dir"); + goto out; + } + + st->minalign_fops = (struct file_operations){ + .owner = THIS_MODULE, + .read = minalign_read_cb, + }; + err = create_read_only_file(dir, "minalign", &st->minalign_fops); + if (err) { + pr_info("kfuzztest: failed to create /_config/minalign"); + goto out; + } + + st->num_invocations_fops = (struct file_operations){ + .owner = THIS_MODULE, + .read = num_invocations_read_cb, + }; + err = create_read_only_file(dir, "num_invocations", &st->num_invocations_fops); + if (err) + pr_info("kfuzztest: failed to create /_config/num_invocations"); +out: + return err; +} + +static int initialize_target_dir(struct kfuzztest_state *st, const struct kfuzztest_target *targ, + struct file_operations *fops) +{ + struct dentry *dir, *input; + int err = 0; + + dir = debugfs_create_dir(targ->name, st->kfuzztest_dir); + if (!dir) + err = -ENOMEM; + else if (IS_ERR(dir)) + err = PTR_ERR(dir); + if (err) { + pr_info("kfuzztest: failed to create /kfuzztest/%s dir", targ->name); + goto out; + } + + input = debugfs_create_file("input", KFUZZTEST_INPUT_PERMS, dir, NULL, fops); + if (!input) + err = -ENOMEM; + else if (IS_ERR(input)) + err = PTR_ERR(input); + if (err) + pr_info("kfuzztest: failed to create /kfuzztest/%s/input", targ->name); +out: + return err; +} + +/** + * kfuzztest_init - initializes the debug filesystem for KFuzzTest + * + * Each registered target in the ".kfuzztest_targets" section gets its own + * subdirectory under "/sys/kernel/debug/kfuzztest/" containing one + * write-only "input" file used for receiving inputs from userspace. + * Furthermore, a directory "/sys/kernel/debug/kfuzztest/_config" is created, + * containing two read-only files "minalign" and "num_targets", that return + * the minimum required region alignment and number of targets respectively. + * + * @return 0 on success or an error + */ +static int __init kfuzztest_init(void) +{ + const struct kfuzztest_target *targ; + int err = 0; + int i = 0; + + state.num_targets = __kfuzztest_targets_end - __kfuzztest_targets_start; + state.target_fops = kzalloc(sizeof(struct file_operations) * state.num_targets, GFP_KERNEL); + if (!state.target_fops) + return -ENOMEM; + + /* Create the main "kfuzztest" directory in /sys/kernel/debug. */ + state.kfuzztest_dir = debugfs_create_dir("kfuzztest", NULL); + if (!state.kfuzztest_dir) { + pr_warn("kfuzztest: could not create 'kfuzztest' debugfs directory"); + return -ENOMEM; + } + if (IS_ERR(state.kfuzztest_dir)) { + pr_warn("kfuzztest: could not create 'kfuzztest' debugfs directory"); + err = PTR_ERR(state.kfuzztest_dir); + state.kfuzztest_dir = NULL; + return err; + } + + err = initialize_config_dir(&state); + if (err) + goto cleanup_failure; + + for (targ = __kfuzztest_targets_start; targ < __kfuzztest_targets_end; targ++, i++) { + state.target_fops[i] = (struct file_operations){ + .owner = THIS_MODULE, + .write = targ->write_input_cb, + }; + err = initialize_target_dir(&state, targ, &state.target_fops[i]); + /* Bail out if a single target fails to initialize. This avoids + * partial setup, and a failure here likely indicates an issue + * with debugfs. */ + if (err) + goto cleanup_failure; + pr_info("kfuzztest: registered target %s", targ->name); + } + return 0; + +cleanup_failure: + cleanup_kfuzztest_state(&state); + return err; +} + +static void __exit kfuzztest_exit(void) +{ + pr_info("kfuzztest: exiting"); + cleanup_kfuzztest_state(&state); +} + +module_init(kfuzztest_init); +module_exit(kfuzztest_exit); diff --git a/lib/kfuzztest/parse.c b/lib/kfuzztest/parse.c new file mode 100644 index 000000000000..5aaeca6a7fde --- /dev/null +++ b/lib/kfuzztest/parse.c @@ -0,0 +1,204 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * KFuzzTest input parsing and validation. + * + * Copyright 2025 Google LLC + */ +#include +#include + +static int kfuzztest_relocate_v0(struct reloc_region_array *regions, struct reloc_table *rt, + unsigned char *payload_start, unsigned char *payload_end) +{ + unsigned char *poison_start, *poison_end; + struct reloc_region reg, src, dst; + uintptr_t *ptr_location; + struct reloc_entry re; + size_t i; + int ret; + + /* Patch pointers. */ + for (i = 0; i < rt->num_entries; i++) { + re = rt->entries[i]; + src = regions->regions[re.region_id]; + ptr_location = (uintptr_t *)(payload_start + src.offset + re.region_offset); + if (re.value == KFUZZTEST_REGIONID_NULL) + *ptr_location = (uintptr_t)NULL; + else if (re.value < regions->num_regions) { + dst = regions->regions[re.value]; + *ptr_location = (uintptr_t)(payload_start + dst.offset); + } else { + return -EINVAL; + } + } + + /* Poison the padding between regions. */ + for (i = 0; i < regions->num_regions; i++) { + reg = regions->regions[i]; + + /* Points to the beginning of the inter-region padding */ + poison_start = payload_start + reg.offset + reg.size; + if (i < regions->num_regions - 1) + poison_end = payload_start + regions->regions[i + 1].offset; + else + poison_end = payload_end; + + if (poison_end > payload_end) + return -EINVAL; + + ret = kasan_poison_range(poison_start, poison_end - poison_start); + if (ret) + return ret; + } + + /* Poison the padded area preceding the payload. */ + return kasan_poison_range(payload_start - rt->padding_size, rt->padding_size); +} + +static bool kfuzztest_input_is_valid(struct reloc_region_array *regions, struct reloc_table *rt, + unsigned char *payload_start, unsigned char *payload_end) +{ + size_t payload_size = payload_end - payload_start; + struct reloc_region reg, next_reg; + size_t usable_payload_size; + uint32_t region_end_offset; + struct reloc_entry reloc; + uint32_t i; + + if (payload_start > payload_end) + return false; + if (payload_size < KFUZZTEST_POISON_SIZE) + return false; + if ((uintptr_t)payload_end % KFUZZTEST_POISON_SIZE) + return false; + usable_payload_size = payload_size - KFUZZTEST_POISON_SIZE; + + for (i = 0; i < regions->num_regions; i++) { + reg = regions->regions[i]; + if (check_add_overflow(reg.offset, reg.size, ®ion_end_offset)) + return false; + if ((size_t)region_end_offset > usable_payload_size) + return false; + + if (i < regions->num_regions - 1) { + next_reg = regions->regions[i + 1]; + if (reg.offset > next_reg.offset) + return false; + /* Enforce the minimum poisonable gap between + * consecutive regions. */ + if (reg.offset + reg.size + KFUZZTEST_POISON_SIZE > next_reg.offset) + return false; + } + } + + if (rt->padding_size < KFUZZTEST_POISON_SIZE) { + pr_info("validation failed because rt->padding_size = %u", rt->padding_size); + return false; + } + + for (i = 0; i < rt->num_entries; i++) { + reloc = rt->entries[i]; + if (reloc.region_id >= regions->num_regions) + return false; + if (reloc.value != KFUZZTEST_REGIONID_NULL && reloc.value >= regions->num_regions) + return false; + + reg = regions->regions[reloc.region_id]; + if (reloc.region_offset % (sizeof(uintptr_t)) || reloc.region_offset + sizeof(uintptr_t) > reg.size) + return false; + } + + return true; +} + +static int kfuzztest_parse_input_v0(unsigned char *input, size_t input_size, struct reloc_region_array **ret_regions, + struct reloc_table **ret_reloc_table, unsigned char **ret_payload_start, + unsigned char **ret_payload_end) +{ + size_t reloc_entries_size, reloc_regions_size; + unsigned char *payload_end, *payload_start; + size_t reloc_table_size, regions_size; + struct reloc_region_array *regions; + struct reloc_table *rt; + size_t curr_offset = 0; + + if (input_size < sizeof(struct reloc_region_array) + sizeof(struct reloc_table)) + return -EINVAL; + + regions = (struct reloc_region_array *)input; + if (check_mul_overflow(regions->num_regions, sizeof(struct reloc_region), &reloc_regions_size)) + return -EINVAL; + if (check_add_overflow(sizeof(*regions), reloc_regions_size, ®ions_size)) + return -EINVAL; + + curr_offset = regions_size; + if (curr_offset > input_size) + return -EINVAL; + if (input_size - curr_offset < sizeof(struct reloc_table)) + return -EINVAL; + + rt = (struct reloc_table *)(input + curr_offset); + + if (check_mul_overflow((size_t)rt->num_entries, sizeof(struct reloc_entry), &reloc_entries_size)) + return -EINVAL; + if (check_add_overflow(sizeof(*rt), reloc_entries_size, &reloc_table_size)) + return -EINVAL; + if (check_add_overflow(reloc_table_size, rt->padding_size, &reloc_table_size)) + return -EINVAL; + + if (check_add_overflow(curr_offset, reloc_table_size, &curr_offset)) + return -EINVAL; + if (curr_offset > input_size) + return -EINVAL; + + payload_start = input + curr_offset; + payload_end = input + input_size; + + if (!kfuzztest_input_is_valid(regions, rt, payload_start, payload_end)) + return -EINVAL; + + *ret_regions = regions; + *ret_reloc_table = rt; + *ret_payload_start = payload_start; + *ret_payload_end = payload_end; + return 0; +} + +static int kfuzztest_parse_and_relocate_v0(unsigned char *input, size_t input_size, void **arg_ret) +{ + unsigned char *payload_start, *payload_end; + struct reloc_region_array *regions; + struct reloc_table *reloc_table; + int ret; + + ret = kfuzztest_parse_input_v0(input, input_size, ®ions, &reloc_table, &payload_start, &payload_end); + if (ret < 0) + return ret; + + ret = kfuzztest_relocate_v0(regions, reloc_table, payload_start, payload_end); + if (ret < 0) + return ret; + *arg_ret = (void *)payload_start; + return 0; +} + +int kfuzztest_parse_and_relocate(void *input, size_t input_size, void **arg_ret) +{ + size_t header_size = 2 * sizeof(u32); + u32 version, magic; + + if (input_size < sizeof(u32) + sizeof(u32)) + return -EINVAL; + + magic = *(u32 *)input; + if (magic != KFUZZTEST_HEADER_MAGIC) + return -EINVAL; + + version = *(u32 *)(input + sizeof(u32)); + switch (version) { + case KFUZZTEST_V0: + return kfuzztest_parse_and_relocate_v0(input + header_size, input_size - header_size, arg_ret); + } + + return -EINVAL; +} -- 2.51.0.384.g4c02a37b29-goog