binder: use cred instead of task for selinux checks

commit 52f88693378a58094c538662ba652aff0253c4fe upstream.

Since binder was integrated with selinux, it has passed
'struct task_struct' associated with the binder_proc
to represent the source and target of transactions.
The conversion of task to SID was then done in the hook
implementations. It turns out that there are race conditions
which can result in an incorrect security context being used.

Fix by using the 'struct cred' saved during binder_open and pass
it to the selinux subsystem.

Cc: stable@vger.kernel.org # 5.14 (need backport for earlier stables)
Fixes: 79af73079d75 ("Add security hooks to binder and implement the hooks for SELinux.")
Suggested-by: Jann Horn <jannh@google.com>
Signed-off-by: Todd Kjos <tkjos@google.com>
Acked-by: Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 0b27238b42c75729553ad43ff006b39b6d4b6244..f4454292f228e640df98844f90863dcf39dac9bb 100644 (file)
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -1420,8 +1420,8 @@ static void binder_transaction(struct binder_proc *proc,
                        return_error = BR_FAILED_REPLY;
                        goto err_invalid_target_handle;
                }
-               if (security_binder_transaction(proc->tsk,
-                                               target_proc->tsk) < 0) {
+               if (security_binder_transaction(proc->cred,
+                                               target_proc->cred) < 0) {
                        return_error = BR_FAILED_REPLY;
                        goto err_invalid_target_handle;
                }
@@ -1576,8 +1576,8 @@ static void binder_transaction(struct binder_proc *proc,
                                return_error = BR_FAILED_REPLY;
                                goto err_binder_get_ref_for_node_failed;
                        }
-                       if (security_binder_transfer_binder(proc->tsk,
-                                                           target_proc->tsk)) {
+                       if (security_binder_transfer_binder(proc->cred,
+                                                           target_proc->cred)) {
                                return_error = BR_FAILED_REPLY;
                                goto err_binder_get_ref_for_node_failed;
                        }
@@ -1616,8 +1616,8 @@ static void binder_transaction(struct binder_proc *proc,
                                return_error = BR_FAILED_REPLY;
                                goto err_binder_get_ref_failed;
                        }
-                       if (security_binder_transfer_binder(proc->tsk,
-                                                           target_proc->tsk)) {
+                       if (security_binder_transfer_binder(proc->cred,
+                                                           target_proc->cred)) {
                                return_error = BR_FAILED_REPLY;
                                goto err_binder_get_ref_failed;
                        }
@@ -1680,8 +1680,8 @@ static void binder_transaction(struct binder_proc *proc,
                                return_error = BR_FAILED_REPLY;
                                goto err_fget_failed;
                        }
-                       if (security_binder_transfer_file(proc->tsk,
-                                                         target_proc->tsk,
+                       if (security_binder_transfer_file(proc->cred,
+                                                         target_proc->cred,
                                                          file) < 0) {
                                fput(file);
                                return_error = BR_FAILED_REPLY;
@@ -2763,7 +2763,7 @@ static int binder_ioctl_set_ctx_mgr(struct file *filp)
                ret = -EBUSY;
                goto out;
        }
-       ret = security_binder_set_context_mgr(proc->tsk);
+       ret = security_binder_set_context_mgr(proc->cred);
        if (ret < 0)
                goto out;
        if (uid_valid(binder_context_mgr_uid)) {

diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h
index ec3a6bab29de3ac499637a1d848f7cd5c6d80c32..169f4be3ce565f043ae9a8b1151f653e9d33fc92 100644 (file)
--- a/include/linux/lsm_hooks.h
+++ b/include/linux/lsm_hooks.h
@@ -1121,22 +1121,22 @@
  *
  * @binder_set_context_mgr
  *     Check whether @mgr is allowed to be the binder context manager.
- *     @mgr contains the task_struct for the task being registered.
+ *     @mgr contains the struct cred for the current binder process.
  *     Return 0 if permission is granted.
  * @binder_transaction
  *     Check whether @from is allowed to invoke a binder transaction call
  *     to @to.
- *     @from contains the task_struct for the sending task.
- *     @to contains the task_struct for the receiving task.
- * @binder_transfer_binder
+ *     @from contains the struct cred for the sending process.
+ *     @to contains the struct cred for the receiving process.
+ * @binder_transfer_binder:
  *     Check whether @from is allowed to transfer a binder reference to @to.
- *     @from contains the task_struct for the sending task.
- *     @to contains the task_struct for the receiving task.
- * @binder_transfer_file
+ *     @from contains the struct cred for the sending process.
+ *     @to contains the struct cred for the receiving process.
+ * @binder_transfer_file:
  *     Check whether @from is allowed to transfer @file to @to.
- *     @from contains the task_struct for the sending task.
+ *     @from contains the struct cred for the sending process.
  *     @file contains the struct file being transferred.
- *     @to contains the task_struct for the receiving task.
+ *     @to contains the struct cred for the receiving process.
  *
  * @ptrace_access_check:
  *     Check permission before allowing the current process to trace the
@@ -1301,13 +1301,13 @@
  */
 
 union security_list_options {
-       int (*binder_set_context_mgr)(struct task_struct *mgr);
-       int (*binder_transaction)(struct task_struct *from,
-                                       struct task_struct *to);
-       int (*binder_transfer_binder)(struct task_struct *from,
-                                       struct task_struct *to);
-       int (*binder_transfer_file)(struct task_struct *from,
-                                       struct task_struct *to,
+       int (*binder_set_context_mgr)(const struct cred *mgr);
+       int (*binder_transaction)(const struct cred *from,
+                                       const struct cred *to);
+       int (*binder_transfer_binder)(const struct cred *from,
+                                       const struct cred *to);
+       int (*binder_transfer_file)(const struct cred *from,
+                                       const struct cred *to,
                                        struct file *file);
 
        int (*ptrace_access_check)(struct task_struct *child,

diff --git a/include/linux/security.h b/include/linux/security.h
index 2f4c1f7aa7db7076998762d2772a35c6e16f9547..846c6d44d6beac0f64c0f757b0feef33bf872890 100644 (file)
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -182,13 +182,13 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 extern int security_init(void);
 
 /* Security operations */
-int security_binder_set_context_mgr(struct task_struct *mgr);
-int security_binder_transaction(struct task_struct *from,
-                               struct task_struct *to);
-int security_binder_transfer_binder(struct task_struct *from,
-                                   struct task_struct *to);
-int security_binder_transfer_file(struct task_struct *from,
-                                 struct task_struct *to, struct file *file);
+int security_binder_set_context_mgr(const struct cred *mgr);
+int security_binder_transaction(const struct cred *from,
+                               const struct cred *to);
+int security_binder_transfer_binder(const struct cred *from,
+                                   const struct cred *to);
+int security_binder_transfer_file(const struct cred *from,
+                                 const struct cred *to, struct file *file);
 int security_ptrace_access_check(struct task_struct *child, unsigned int mode);
 int security_ptrace_traceme(struct task_struct *parent);
 int security_capget(struct task_struct *target,
@@ -378,25 +378,25 @@ static inline int security_init(void)
        return 0;
 }
 
-static inline int security_binder_set_context_mgr(struct task_struct *mgr)
+static inline int security_binder_set_context_mgr(const struct cred *mgr)
 {
        return 0;
 }
 
-static inline int security_binder_transaction(struct task_struct *from,
-                                             struct task_struct *to)
+static inline int security_binder_transaction(const struct cred *from,
+                                             const struct cred *to)
 {
        return 0;
 }
 
-static inline int security_binder_transfer_binder(struct task_struct *from,
-                                                 struct task_struct *to)
+static inline int security_binder_transfer_binder(const struct cred *from,
+                                                 const struct cred *to)
 {
        return 0;
 }
 
-static inline int security_binder_transfer_file(struct task_struct *from,
-                                               struct task_struct *to,
+static inline int security_binder_transfer_file(const struct cred *from,
+                                               const struct cred *to,
                                                struct file *file)
 {
        return 0;

diff --git a/security/security.c b/security/security.c
index 0dde287db5c5dd2935e0be069af9ab57636a5b71..b81a709ff331eab0ab64b2cd58a31b33130decc2 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -130,25 +130,25 @@ int __init security_module_enable(const char *module)
 
 /* Security operations */
 
-int security_binder_set_context_mgr(struct task_struct *mgr)
+int security_binder_set_context_mgr(const struct cred *mgr)
 {
        return call_int_hook(binder_set_context_mgr, 0, mgr);
 }
 
-int security_binder_transaction(struct task_struct *from,
-                               struct task_struct *to)
+int security_binder_transaction(const struct cred *from,
+                               const struct cred *to)
 {
        return call_int_hook(binder_transaction, 0, from, to);
 }
 
-int security_binder_transfer_binder(struct task_struct *from,
-                                   struct task_struct *to)
+int security_binder_transfer_binder(const struct cred *from,
+                                   const struct cred *to)
 {
        return call_int_hook(binder_transfer_binder, 0, from, to);
 }
 
-int security_binder_transfer_file(struct task_struct *from,
-                                 struct task_struct *to, struct file *file)
+int security_binder_transfer_file(const struct cred *from,
+                                 const struct cred *to, struct file *file)
 {
        return call_int_hook(binder_transfer_file, 0, from, to, file);
 }

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 055bf769408e653118f7198c99d5c7591fb8cecc..44f4495e3fbd9c1f2edf14a0fe2083841908ae92 100644 (file)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -1974,21 +1974,18 @@ static inline u32 open_file_to_av(struct file *file)
 
 /* Hook functions begin here. */
 
-static int selinux_binder_set_context_mgr(struct task_struct *mgr)
+static int selinux_binder_set_context_mgr(const struct cred *mgr)
 {
-       u32 mysid = current_sid();
-       u32 mgrsid = task_sid(mgr);
-
-       return avc_has_perm(mysid, mgrsid, SECCLASS_BINDER,
+       return avc_has_perm(current_sid(), cred_sid(mgr), SECCLASS_BINDER,
                            BINDER__SET_CONTEXT_MGR, NULL);
 }
 
-static int selinux_binder_transaction(struct task_struct *from,
-                                     struct task_struct *to)
+static int selinux_binder_transaction(const struct cred *from,
+                                     const struct cred *to)
 {
        u32 mysid = current_sid();
-       u32 fromsid = task_sid(from);
-       u32 tosid = task_sid(to);
+       u32 fromsid = cred_sid(from);
+       u32 tosid = cred_sid(to);
        int rc;
 
        if (mysid != fromsid) {
@@ -2002,21 +1999,19 @@ static int selinux_binder_transaction(struct task_struct *from,
                            NULL);
 }
 
-static int selinux_binder_transfer_binder(struct task_struct *from,
-                                         struct task_struct *to)
+static int selinux_binder_transfer_binder(const struct cred *from,
+                                         const struct cred *to)
 {
-       u32 fromsid = task_sid(from);
-       u32 tosid = task_sid(to);
-
-       return avc_has_perm(fromsid, tosid, SECCLASS_BINDER, BINDER__TRANSFER,
+       return avc_has_perm(cred_sid(from), cred_sid(to),
+                           SECCLASS_BINDER, BINDER__TRANSFER,
                            NULL);
 }
 
-static int selinux_binder_transfer_file(struct task_struct *from,
-                                       struct task_struct *to,
+static int selinux_binder_transfer_file(const struct cred *from,
+                                       const struct cred *to,
                                        struct file *file)
 {
-       u32 sid = task_sid(to);
+       u32 sid = cred_sid(to);
        struct file_security_struct *fsec = file->f_security;
        struct inode *inode = d_backing_inode(file->f_path.dentry);
        struct inode_security_struct *isec = inode->i_security;