Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795053977; b=RIkhas1D/EyOMsDJ39VCCXR3Hz2qqMnwfETjoMxuWR0M7Jcjx33jjrqWKDldOOt8qAtM eeIaB6hR30+7GFuRNjIIus3uHrc8RVsoFYXR1NkbLVg/mqmwjgdVegJ02zxpvQ09q4e2e CYGYKocMf9eKIJLdLKU+1tKPuyhCbOa96G8QjYAeB4Js3UWL6DFlfTgRTZA9I6KZmjz77 BXkZ0zfqOzj8nLdt0PCS3ywJd2q9jkUA+kYpS/KxkY06yn9kOCycN/A3WBgCn2NUrwQ5m 449FnXULifmOLr6ydNT7z3tz+u/g0O9yYoPyFAW7xEwSNyenRmfldUA083Xl74wR0nA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795053977; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=fokilYVG3DnWwgVBMUPS454LI/l2eh9ALo9A2E8K8uc=; b=UWXqWEhbM+pWIhoUyDM6SlFK357Hb6ksVcyYECqP6XxTfikZXSXgUOENpDUr4wIZCmQq onoUBr9kbKRGkRm8d7MpgOyEvkIvXMRyIwjsgiavMbbXw8NvGEyaiRF28HEycSCArFXg+ aNbAzPxAXtbmdPkW5ukwX13SGV/4AzVBIr9d6dSGR7WM5DUzd6b726ymja5WpmIN13dFW aKaz9l+p3S15GcSp2oheleYhRVWl89BegjrgnthAdkKwWZNzlEdqEdwlyFFlRtldOhfkV smMpUedo4GJYYCRYjoH9PQVVPhkQj/r+VNpgQhpNEdN/02SGRzWxLx9FVijffi0TKQw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b="VSV/8Hs3"; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 24B20606A325; Thu, 19 Nov 2026 02:06:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=VSV/8Hs3 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6CE181F000C4; Thu, 19 Nov 2026 02:06:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795053976; bh=fokilYVG3DnWwgVBMUPS454LI/l2eh9ALo9A2E8K8uc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VSV/8Hs3ndGyE77/cnuzFu608W+evWS5iGhOXp5yHWvODJoqipXq4bMedgQThcvpx 3peR0JvMl1toveoqMB7VAgO6ItndpcO+89EatMeP1B499qxbHDlN8fMmsVxNhNK1H8 2GC33FdotXl7LdxoVwOKulk92prq9k/Wy+/HOqdU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sung Byeongchan , Miklos Szeredi , Sasha Levin Subject: [PATCH 5.15 1070/2214] virtiofs: validate fixed-output response length Date: Wed, 18 Nov 2026 15:45:46 +0100 Message-ID: <20261118150055.080481536@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sung Byeongchan [ Upstream commit 5364d081125a34e90851fbb46ecc93f79339ce78 ] A short successful virtiofs response can leave the fixed-output portion of the request argument buffer unwritten. The completion path nevertheless copies the full declared output to the request destination, allowing stale allocator contents to reach callers such as fuse_statfs(). Require successful fixed-output responses to contain their complete declared output. Continue to permit a shorter final argument only for out_argvar requests. Reject positive and internal restart error values and require valid error replies to be header-only. The error already stored in the FUSE output header is returned by fuse_request_end(), so do not copy output arguments from an error reply. This was found by source review with AI assistance. A header-only successful FUSE_STATFS reply returned stale fields in nine of nine calls across three boots. The fixed kernel rejected the short response and preserved complete replies, valid negative-error replies, and variable-output replies. Fixes: a62a8ef9d97d ("virtio-fs: add virtiofs filesystem") Cc: stable@vger.kernel.org Assisted-by: LLM Signed-off-by: Sung Byeongchan Signed-off-by: Miklos Szeredi Signed-off-by: Sasha Levin --- fs/fuse/virtio_fs.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c index c375a5f001056..14c1ae5075938 100644 --- a/fs/fuse/virtio_fs.c +++ b/fs/fuse/virtio_fs.c @@ -522,6 +522,10 @@ static void copy_args_from_argbuf(struct fuse_args *args, struct fuse_req *req) unsigned int num_out; unsigned int i; + /* fuse_request_end() returns this error; there are no args to copy. */ + if (req->out.h.error) + goto out; + remaining = req->out.h.len - sizeof(req->out.h); num_in = args->in_numargs - args->in_pages; num_out = args->out_numargs - args->out_pages; @@ -547,6 +551,7 @@ static void copy_args_from_argbuf(struct fuse_args *args, struct fuse_req *req) if (args->out_argvar) args->out_args[args->out_numargs - 1].size = remaining; +out: kfree(req->argbuf); req->argbuf = NULL; } @@ -554,7 +559,9 @@ static void copy_args_from_argbuf(struct fuse_args *args, struct fuse_req *req) /* Verify that the server properly follows the FUSE protocol */ static bool virtio_fs_verify_response(struct fuse_req *req, unsigned int len) { + struct fuse_args *args = req->args; struct fuse_out_header *oh = &req->out.h; + unsigned int expected; if (len < sizeof(*oh)) { pr_warn("virtio-fs: response too short (%u)\n", len); @@ -569,6 +576,29 @@ static bool virtio_fs_verify_response(struct fuse_req *req, unsigned int len) oh->unique, req->in.h.unique); return false; } + if (oh->error <= -ERESTARTSYS || oh->error > 0) { + pr_warn("virtio-fs: invalid error value (%d)\n", oh->error); + return false; + } + + if (oh->error) { + if (len != sizeof(*oh)) { + pr_warn("virtio-fs: error response too long (%u)\n", len); + return false; + } + return true; + } + + expected = sizeof(*oh) + + fuse_len_args(args->out_numargs, args->out_args); + if (len > expected || + (len < expected && + (!args->out_argvar || + expected - len > args->out_args[args->out_numargs - 1].size))) { + pr_warn("virtio-fs: invalid response length (%u, expected %u)\n", + len, expected); + return false; + } return true; } -- 2.53.0