From 01df9f93baafe0243264cf24f42d84e124c9ee0a Mon Sep 17 00:00:00 2001
From: Joe Lawrence <joe.lawrence@redhat.com>
Date: Tue, 4 Jan 2022 13:53:44 -0500
Subject: [KPATCH CVE-2021-4155] xfs: kpatch fixes for CVE-2021-4155
Kernels:
3.10.0-1160.15.2.el7
3.10.0-1160.21.1.el7
3.10.0-1160.24.1.el7
3.10.0-1160.25.1.el7
3.10.0-1160.31.1.el7
3.10.0-1160.36.2.el7
3.10.0-1160.41.1.el7
3.10.0-1160.42.2.el7
3.10.0-1160.45.1.el7
3.10.0-1160.49.1.el7
3.10.0-1160.53.1.el7
Changes since last build:
arches: x86_64 ppc64le
xfs_ioctl.o: changed function: xfs_ioc_space
---------------------------
Kpatch-MR: https://gitlab.com/redhat/prdsc/rhel/src/kpatch/rhel-7/-/merge_requests/15
Approved-by: Yannick Cote (@ycote1)
Approved-by: Artem Savkov (@artem.savkov)
Kernels:
3.10.0-1160.21.1.el7
3.10.0-1160.24.1.el7
3.10.0-1160.25.1.el7
3.10.0-1160.31.1.el7
3.10.0-1160.36.2.el7
3.10.0-1160.41.1.el7
3.10.0-1160.42.2.el7
3.10.0-1160.45.1.el7
3.10.0-1160.49.1.el7
3.10.0-1160.53.1.el7
Modifications: none
Z-MR: https://gitlab.com/redhat/prdsc/rhel/src/kernel-private/rhel-7/-/merge_requests/18
KT0 test PASS: https://beaker.engineering.redhat.com/jobs/6164756
for kpatch-patch-3_10_0-1160_15_2-1-11.el7 scratch build:
https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=42181339
commit 65cb42abca9a5a600cbbdbbef8ddbafd028b7b5d
Author: Carlos Maiolino <cmaiolino@redhat.com>
Date: Tue Jan 4 08:29:12 2022 +0100
xfs: map unwritten blocks in XFS_IOC_{ALLOC,FREE}SP just like fallocate
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2034857
CVE: CVE-2021-4155
Tested: xfstests and specific reproducer
Upstream status: Posted privately due to embargo
Conflicts:
- el7 required small adjustment to the patch, to fit the old
code.
The old ALLOCSP/FREESP ioctls in XFS can be used to preallocate space at
the end of files, just like fallocate and RESVSP. Make the behavior
consistent with the other ioctls.
Reported-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
(cherry picked from commit 983d8e60f50806f90534cc5373d0ce867e5aaf79)
Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com>
---
fs/xfs/xfs_ioctl.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index 722396680482..8f1c795c8765 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -773,7 +773,8 @@ xfs_ioc_space(
flags |= XFS_PREALLOC_CLEAR;
if (bf->l_start > XFS_ISIZE(ip)) {
error = xfs_alloc_file_space(ip, XFS_ISIZE(ip),
- bf->l_start - XFS_ISIZE(ip), 0);
+ bf->l_start - XFS_ISIZE(ip),
+ XFS_BMAPI_PREALLOC);
if (error)
goto out_unlock;
}
--
2.26.3