Merge tag 'fs.vfsuid.conversion.v6.2' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / fs / coredump.c

diff --git a/fs/coredump.c b/fs/coredump.c
index 9a745d08c57fb3532315ffc8cecbfb0a5abce98d..a4c30bb900feb9fec72b64989af69f4377267173 100644 (file)
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@ -720,8 +720,8 @@ void do_coredump(const kernel_siginfo_t *siginfo)
                 * filesystem.
                 */
                mnt_userns = file_mnt_user_ns(cprm.file);
-               if (!uid_eq(i_uid_into_mnt(mnt_userns, inode),
-                           current_fsuid())) {
+               if (!vfsuid_eq_kuid(i_uid_into_vfsuid(mnt_userns, inode),
+                                   current_fsuid())) {
                        pr_info_ratelimited("Core dump to %s aborted: cannot preserve file owner\n",
                                            cn.corename);
                        goto close_fail;