From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D996B2F12AE; Tue, 16 Jun 2026 17:56:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781632615; cv=none; b=H1TqSxxKMpUQEa1Z1IIpS7hrKatBfEsRQfNWS/xg7pqBb/32N27AIwtNBqgMYw49ibDPvD/eVEYIQseH+147Vv8t5tAwH/E7Ne64LU3Of/O7RxP9QYeQAeeC1cdtS6EyX5BiSxEHtTZXxKrxjDWt63nX5dWI+dHqhEfnfcIaElY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781632615; c=relaxed/simple; bh=Z4BwJr5CKbIOJjW4EOIg+ZMoJFnLsh0m9R4kqNBcYDg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t9Q0OUHDwedzgV7nWTAtD5EjMqmN7WS7tx72Ivcwn4EZ/4ltn5XfzK0910amYyf5osmZRgcMgCVBmiDO68wAd/nbOq/Z1hmtp5yFWLdK5zua4fvdOaOnvUeoV4+YeQErufSX5xqyfTW4JRIw+I51GaHPIPwaJdFFp03/TFyWxfY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hnvGANKx; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="hnvGANKx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B3A051F000E9; Tue, 16 Jun 2026 17:56:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781632614; bh=RuiptdtCy6uLakS2wCqv0nK5m7WkbRFNPWoMWyeLfNY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hnvGANKxezpC+P9kl37BqEST24gYbL5ARkA29A9qDSmUPWMSUanjTU8ep3ti/vl2K e6w0IP3WJ172UeMJv9YMEUVhq4uStbuyQKnNVdc7tGFTKEEBm7xMHVeosVJHO8Ks20 FkvcMwaSO+FB+3m7fIY52uBDYwCkabF1yGbRCnA0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yochai Eisenrich , David Sterba , Sasha Levin Subject: [PATCH 6.1 412/522] btrfs: fix btrfs_ioctl_space_info() slot_count TOCTOU which can lead to info-leak Date: Tue, 16 Jun 2026 20:29:19 +0530 Message-ID: <20260616145145.328883192@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145125.307082728@linuxfoundation.org> References: <20260616145125.307082728@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yochai Eisenrich [ Upstream commit 973e57c726c1f8e77259d1c8e519519f1e9aea77 ] btrfs_ioctl_space_info() has a TOCTOU race between two passes over the block group RAID type lists. The first pass counts entries to determine the allocation size, then the second pass fills the buffer. The groups_sem rwlock is released between passes, allowing concurrent block group removal to reduce the entry count. When the second pass fills fewer entries than the first pass counted, copy_to_user() copies the full alloc_size bytes including trailing uninitialized kmalloc bytes to userspace. Fix by copying only total_spaces entries (the actually-filled count from the second pass) instead of alloc_size bytes, and switch to kzalloc so any future copy size mismatch cannot leak heap data. Fixes: 7fde62bffb57 ("Btrfs: buffer results in the space_info ioctl") CC: stable@vger.kernel.org # 3.0 Signed-off-by: Yochai Eisenrich Reviewed-by: David Sterba Signed-off-by: David Sterba [ adapted upstream's `return -EFAULT;` to stable's `ret = -EFAULT;` fall-through to existing `out:` cleanup label ] Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/ioctl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -3977,7 +3977,7 @@ static long btrfs_ioctl_space_info(struc return -ENOMEM; space_args.total_spaces = 0; - dest = kmalloc(alloc_size, GFP_KERNEL); + dest = kzalloc(alloc_size, GFP_KERNEL); if (!dest) return -ENOMEM; dest_orig = dest; @@ -4033,7 +4033,8 @@ static long btrfs_ioctl_space_info(struc user_dest = (struct btrfs_ioctl_space_info __user *) (arg + sizeof(struct btrfs_ioctl_space_args)); - if (copy_to_user(user_dest, dest_orig, alloc_size)) + if (copy_to_user(user_dest, dest_orig, + space_args.total_spaces * sizeof(*dest_orig))) ret = -EFAULT; kfree(dest_orig);