proc: don't show nonexistent capabilities

[karo-tx-linux.git] / fs / proc / array.c

diff --git a/fs/proc/array.c b/fs/proc/array.c
index c1c207c36caefeb1fcbc8d782504cfcbf1b616d8..d4efc333b1325ef42fee27925cf579ac544935ce 100644 (file)
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -308,6 +308,10 @@ static void render_cap_t(struct seq_file *m, const char *header,
        seq_putc(m, '\n');
 }
 
+/* Remove non-existent capabilities */
+#define NORM_CAPS(v) (v.cap[CAP_TO_INDEX(CAP_LAST_CAP)] &= \
+                               CAP_TO_MASK(CAP_LAST_CAP + 1) - 1)
+
 static inline void task_cap(struct seq_file *m, struct task_struct *p)
 {
        const struct cred *cred;
@@ -321,6 +325,11 @@ static inline void task_cap(struct seq_file *m, struct task_struct *p)
        cap_bset        = cred->cap_bset;
        rcu_read_unlock();
 
+       NORM_CAPS(cap_inheritable);
+       NORM_CAPS(cap_permitted);
+       NORM_CAPS(cap_effective);
+       NORM_CAPS(cap_bset);
+
        render_cap_t(m, "CapInh:\t", &cap_inheritable);
        render_cap_t(m, "CapPrm:\t", &cap_permitted);
        render_cap_t(m, "CapEff:\t", &cap_effective);