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