1 files changed, 15 insertions, 6 deletions

diff --git a/fs/proc/array.c b/fs/proc/array.c
index b380313092bd..6ba2746e4517 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -281,14 +281,23 @@ static inline char *task_sig(struct task_struct *p, char *buffer)
         return buffer;
 }
 
+static char *render_cap_t(const char *header, kernel_cap_t *a, char *buffer)
+{
+        unsigned __capi;
+
+        buffer += sprintf(buffer, "%s", header);
+        CAP_FOR_EACH_U32(__capi) {
+                buffer += sprintf(buffer, "%08x",
+                                  a->cap[(_LINUX_CAPABILITY_U32S-1) - __capi]);
+        }
+        return buffer + sprintf(buffer, "\n");
+}
+
 static inline char *task_cap(struct task_struct *p, char *buffer)
 {
-    return buffer + sprintf(buffer, "CapInh:\t%016x\n"
-                            "CapPrm:\t%016x\n"
-                            "CapEff:\t%016x\n",
-                            cap_t(p->cap_inheritable),
-                            cap_t(p->cap_permitted),
-                            cap_t(p->cap_effective));
+        buffer = render_cap_t("CapInh:\t", &p->cap_inheritable, buffer);
+        buffer = render_cap_t("CapPrm:\t", &p->cap_permitted, buffer);
+        return render_cap_t("CapEff:\t", &p->cap_effective, buffer);
 }
 
 static inline char *task_context_switch_counts(struct task_struct *p,