2 files changed, 8 insertions, 4 deletions

diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index e5d528e0c46e..6fccb69c03e7 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -197,8 +197,8 @@ core_pattern is used to specify a core dumpfile pattern name.
         %P      global pid (init PID namespace)
         %i      tid
         %I      global tid (init PID namespace)
-        %u      uid
-        %g      gid
+        %u      uid (in initial user namespace)
+        %g      gid (in initial user namespace)
         %d      dump mode, matches PR_SET_DUMPABLE and
                 /proc/sys/fs/suid_dumpable
         %s      signal number
diff --git a/fs/coredump.c b/fs/coredump.c
index bbbe139ab280..833a57bc856c 100644
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@ -209,11 +209,15 @@ static int format_corename(struct core_name *cn, struct coredump_params *cprm)
                                 break;
                         /* uid */
                         case 'u':
-                                err = cn_printf(cn, "%d", cred->uid);
+                                err = cn_printf(cn, "%u",
+                                                from_kuid(&init_user_ns,
+                                                          cred->uid));
                                 break;
                         /* gid */
                         case 'g':
-                                err = cn_printf(cn, "%d", cred->gid);
+                                err = cn_printf(cn, "%u",
+                                                from_kgid(&init_user_ns,
+                                                          cred->gid));
                                 break;
                         case 'd':
                                 err = cn_printf(cn, "%d",