Merge commit 'v2.6.30' into for-2.6.31

[safe/jmp/linux-2.6] / security / commoncap.c

diff --git a/security/commoncap.c b/security/commoncap.c
index 7f0b2a6..beac025 100644 (file)
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -43,42 +43,22 @@ int cap_netlink_recv(struct sk_buff *skb, int cap)
 EXPORT_SYMBOL(cap_netlink_recv);
 
 /**
- * cap_capable - Determine whether current has a particular effective capability
- * @cap: The capability to check for
- * @audit: Whether to write an audit message or not
- *
- * Determine whether the nominated task has the specified capability amongst
- * its effective set, returning 0 if it does, -ve if it does not.  Note that
- * this uses current's subjective/effective credentials.
- *
- * NOTE WELL: cap_capable() cannot be used like the kernel's capable()
- * function.  That is, it has the reverse semantics: cap_capable() returns 0
- * when a task has a capability, but the kernel's capable() returns 1 for this
- * case.
- */
-int cap_capable(int cap, int audit)
-{
-       return cap_raised(current_cap(), cap) ? 0 : -EPERM;
-}
-
-/**
- * cap_has_capability - Determine whether a task has a particular effective capability
+ * cap_capable - Determine whether a task has a particular effective capability
  * @tsk: The task to query
  * @cred: The credentials to use
  * @cap: The capability to check for
  * @audit: Whether to write an audit message or not
  *
  * Determine whether the nominated task has the specified capability amongst
- * its effective set, returning 0 if it does, -ve if it does not.  Note that
- * this uses the task's objective/real credentials.
+ * its effective set, returning 0 if it does, -ve if it does not.
  *
- * NOTE WELL: cap_has_capability() cannot be used like the kernel's
- * has_capability() function.  That is, it has the reverse semantics:
+ * NOTE WELL: cap_has_capability() cannot be used like the kernel's capable()
+ * and has_capability() functions.  That is, it has the reverse semantics:
  * cap_has_capability() returns 0 when a task has a capability, but the
- * kernel's has_capability() returns 1 for this case.
+ * kernel's capable() and has_capability() returns 1 for this case.
  */
-int cap_task_capable(struct task_struct *tsk, const struct cred *cred, int cap,
-                    int audit)
+int cap_capable(struct task_struct *tsk, const struct cred *cred, int cap,
+               int audit)
 {
        return cap_raised(cred->cap_effective, cap) ? 0 : -EPERM;
 }
@@ -176,7 +156,8 @@ static inline int cap_inh_is_capped(void)
        /* they are so limited unless the current task has the CAP_SETPCAP
         * capability
         */
-       if (cap_capable(CAP_SETPCAP, SECURITY_CAP_AUDIT) == 0)
+       if (cap_capable(current, current_cred(), CAP_SETPCAP,
+                       SECURITY_CAP_AUDIT) == 0)
                return 0;
 #endif
        return 1;
@@ -254,7 +235,7 @@ int cap_inode_need_killpriv(struct dentry *dentry)
        struct inode *inode = dentry->d_inode;
        int error;
 
-       if (!inode->i_op || !inode->i_op->getxattr)
+       if (!inode->i_op->getxattr)
               return 0;
 
        error = inode->i_op->getxattr(dentry, XATTR_NAME_CAPS, NULL, 0);
@@ -275,7 +256,7 @@ int cap_inode_killpriv(struct dentry *dentry)
 {
        struct inode *inode = dentry->d_inode;
 
-       if (!inode->i_op || !inode->i_op->removexattr)
+       if (!inode->i_op->removexattr)
               return 0;
 
        return inode->i_op->removexattr(dentry, XATTR_NAME_CAPS);
@@ -333,7 +314,7 @@ int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data
 
        memset(cpu_caps, 0, sizeof(struct cpu_vfs_cap_data));
 
-       if (!inode || !inode->i_op || !inode->i_op->getxattr)
+       if (!inode || !inode->i_op->getxattr)
                return -ENODATA;
 
        size = inode->i_op->getxattr((struct dentry *)dentry, XATTR_NAME_CAPS, &caps,
@@ -885,7 +866,8 @@ int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,
                     & (new->securebits ^ arg2))                        /*[1]*/
                    || ((new->securebits & SECURE_ALL_LOCKS & ~arg2))   /*[2]*/
                    || (arg2 & ~(SECURE_ALL_LOCKS | SECURE_ALL_BITS))   /*[3]*/
-                   || (cap_capable(CAP_SETPCAP, SECURITY_CAP_AUDIT) != 0) /*[4]*/
+                   || (cap_capable(current, current_cred(), CAP_SETPCAP,
+                                   SECURITY_CAP_AUDIT) != 0)           /*[4]*/
                        /*
                         * [1] no changing of bits that are locked
                         * [2] no unlocking of locks
@@ -934,7 +916,6 @@ changed:
        return commit_creds(new);
 
 no_change:
-       error = 0;
 error:
        abort_creds(new);
        return error;
@@ -966,7 +947,8 @@ int cap_vm_enough_memory(struct mm_struct *mm, long pages)
 {
        int cap_sys_admin = 0;
 
-       if (cap_capable(CAP_SYS_ADMIN, SECURITY_CAP_NOAUDIT) == 0)
+       if (cap_capable(current, current_cred(), CAP_SYS_ADMIN,
+                       SECURITY_CAP_NOAUDIT) == 0)
                cap_sys_admin = 1;
        return __vm_enough_memory(mm, pages, cap_sys_admin);
 }