|
 |
7edbd0 |
From 3bf90da39cf14660a11e3980451c757398bcf84e Mon Sep 17 00:00:00 2001
|
|
|
7edbd0 |
From: Ryan Sullivan <rysulliv@redhat.com>
|
|
|
7edbd0 |
Date: Wed, 15 Mar 2023 10:24:04 -0400
|
|
|
7edbd0 |
Subject: [KPATCH CVE-2023-0386] kpatch fixes for CVE-2023-0386
|
|
|
7edbd0 |
|
|
|
7edbd0 |
Kernels:
|
|
|
7edbd0 |
5.14.0-162.6.1.el9_1
|
|
|
7edbd0 |
5.14.0-162.12.1.el9_1
|
|
|
7edbd0 |
5.14.0-162.18.1.el9_1
|
|
|
7edbd0 |
|
|
|
7edbd0 |
|
|
|
7edbd0 |
Kpatch-MR: https://gitlab.com/redhat/prdsc/rhel/src/kpatch/rhel-9/-/merge_requests/26
|
|
|
7edbd0 |
Approved-by: Joe Lawrence (@joe.lawrence)
|
|
|
7edbd0 |
Approved-by: Yannick Cote (@ycote1)
|
|
|
7edbd0 |
Changes since last build:
|
|
|
7edbd0 |
arches: x86_64 ppc64le
|
|
|
7edbd0 |
copy_up.o: changed function: ovl_copy_up_one
|
|
|
7edbd0 |
---------------------------
|
|
|
7edbd0 |
|
|
|
7edbd0 |
Modifications: none
|
|
|
7edbd0 |
|
|
|
7edbd0 |
commit 977edea04b2c1dd1dc51ae7a1dbf5b484c048045
|
|
|
7edbd0 |
Author: Miklos Szeredi <mszeredi@redhat.com>
|
|
|
7edbd0 |
Date: Tue Jan 24 16:41:18 2023 +0100
|
|
|
7edbd0 |
|
|
|
7edbd0 |
ovl: fail on invalid uid/gid mapping at copy up
|
|
|
7edbd0 |
|
|
|
7edbd0 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2165344
|
|
|
7edbd0 |
CVE: CVE-2023-0386
|
|
|
7edbd0 |
|
|
|
7edbd0 |
If st_uid/st_gid doesn't have a mapping in the mounter's user_ns, then
|
|
|
7edbd0 |
copy-up should fail, just like it would fail if the mounter task was doing
|
|
|
7edbd0 |
the copy using "cp -a".
|
|
|
7edbd0 |
|
|
|
7edbd0 |
There's a corner case where the "cp -a" would succeed but copy up fail: if
|
|
|
7edbd0 |
there's a mapping of the invalid uid/gid (65534 by default) in the user
|
|
|
7edbd0 |
namespace. This is because stat(2) will return this value if the mapping
|
|
|
7edbd0 |
doesn't exist in the current user_ns and "cp -a" will in turn be able to
|
|
|
7edbd0 |
create a file with this uid/gid.
|
|
|
7edbd0 |
|
|
|
7edbd0 |
This behavior would be inconsistent with POSIX ACL's, which return -1 for
|
|
|
7edbd0 |
invalid uid/gid which result in a failed copy.
|
|
|
7edbd0 |
|
|
|
7edbd0 |
For consistency and simplicity fail the copy of the st_uid/st_gid are
|
|
|
7edbd0 |
invalid.
|
|
|
7edbd0 |
|
|
|
7edbd0 |
Fixes: 459c7c565ac3 ("ovl: unprivieged mounts")
|
|
|
7edbd0 |
Cc: <stable@vger.kernel.org> # v5.11
|
|
|
7edbd0 |
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
|
|
|
7edbd0 |
Reviewed-by: Christian Brauner <brauner@kernel.org>
|
|
|
7edbd0 |
Reviewed-by: Seth Forshee <sforshee@kernel.org>
|
|
|
7edbd0 |
(cherry picked from commit 4f11ada10d0ad3fd53e2bd67806351de63a4f9c3)
|
|
|
7edbd0 |
|
|
|
7edbd0 |
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
|
|
|
7edbd0 |
|
|
|
7edbd0 |
Signed-off-by: Ryan Sullivan <rysulliv@redhat.com>
|
|
|
7edbd0 |
---
|
|
|
7edbd0 |
fs/overlayfs/copy_up.c | 4 ++++
|
|
|
7edbd0 |
1 file changed, 4 insertions(+)
|
|
|
7edbd0 |
|
|
|
7edbd0 |
diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
|
|
|
7edbd0 |
index 2846b943e80c..95b2173ab9bc 100644
|
|
|
7edbd0 |
--- a/fs/overlayfs/copy_up.c
|
|
|
7edbd0 |
+++ b/fs/overlayfs/copy_up.c
|
|
|
7edbd0 |
@@ -886,6 +886,10 @@ static int ovl_copy_up_one(struct dentry *parent, struct dentry *dentry,
|
|
|
7edbd0 |
if (err)
|
|
|
7edbd0 |
return err;
|
|
|
7edbd0 |
|
|
|
7edbd0 |
+ if (!kuid_has_mapping(current_user_ns(), ctx.stat.uid) ||
|
|
|
7edbd0 |
+ !kgid_has_mapping(current_user_ns(), ctx.stat.gid))
|
|
|
7edbd0 |
+ return -EOVERFLOW;
|
|
|
7edbd0 |
+
|
|
|
7edbd0 |
ctx.metacopy = ovl_need_meta_copy_up(dentry, ctx.stat.mode, flags);
|
|
|
7edbd0 |
|
|
|
7edbd0 |
if (parent) {
|
|
|
7edbd0 |
--
|
|
|
7edbd0 |
2.39.2
|
|
|
7edbd0 |
|
|
|
7edbd0 |
|