1 files changed, 12 insertions, 7 deletions

diff --git a/security/dummy.c b/security/dummy.c
index 48d4b0a52737..649326bf64ea 100644
--- a/security/dummy.c
+++ b/security/dummy.c
@@ -36,14 +36,19 @@ static int dummy_ptrace (struct task_struct *parent, struct task_struct *child)
 static int dummy_capget (struct task_struct *target, kernel_cap_t * effective,
                          kernel_cap_t * inheritable, kernel_cap_t * permitted)
 {
-        *effective = *inheritable = *permitted = 0;
         if (target->euid == 0) {
-                *permitted |= (~0 & ~CAP_FS_MASK);
-                *effective |= (~0 & ~CAP_TO_MASK(CAP_SETPCAP) & ~CAP_FS_MASK);
+                cap_set_full(*permitted);
+                cap_set_init_eff(*effective);
+        } else {
+                cap_clear(*permitted);
+                cap_clear(*effective);
         }
-        if (target->fsuid == 0) {
-                *permitted |= CAP_FS_MASK;
-                *effective |= CAP_FS_MASK;
+
+        cap_clear(*inheritable);
+
+        if (target->fsuid != 0) {
+                *permitted = cap_drop_fs_set(*permitted);
+                *effective = cap_drop_fs_set(*effective);
         }
         return 0;
 }
@@ -402,7 +407,7 @@ static int dummy_inode_killpriv(struct dentry *dentry)
         return 0;
 }
 
-static int dummy_inode_getsecurity(const struct inode *inode, const char *name, void *buffer, size_t size, int err)
+static int dummy_inode_getsecurity(const struct inode *inode, const char *name, void **buffer, bool alloc)
 {
         return -EOPNOTSUPP;
 }