binder: use cred instead of task for getsecid

commit 4d5b5539742d2554591751b4248b0204d20dcc9d upstream.

Use the 'struct cred' saved at binder_open() to lookup
the security ID via security_cred_getsecid(). This
ensures that the security context that opened binder
is the one used to generate the secctx.

Cc: stable@vger.kernel.org # 5.4+
Fixes: ec74136ded79 ("binder: create node flag to request sender's security context")
Signed-off-by: Todd Kjos <tkjos@google.com>
Suggested-by: Stephen Smalley <stephen.smalley.work@gmail.com>
Reported-by: kernel test robot <lkp@intel.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>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 55939a02c5b4d0ef12d48ae62d952106ca6960b8..e0e4be8d8b9f3c047d67c104c12509f851e6b874 100644 (file)
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -2729,7 +2729,7 @@ static void binder_transaction(struct binder_proc *proc,
                 * here; however, it isn't clear that binder would handle that
                 * case well anyway.
                 */
-               security_task_getsecid_obj(proc->tsk, &blob);
+               security_cred_getsecid(proc->cred, &blob);
                ret = security_secid_to_secctx(&blob, &lsmctx, LSMBLOB_DISPLAY);
                if (ret) {
                        return_error = BR_FAILED_REPLY;

diff --git a/include/linux/security.h b/include/linux/security.h
index cfc53e5ad6346f49cfe08d508a5766a80457425d..9b55c2df869a0d7764c0c1de5639275fe4a1d04d 100644 (file)
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1169,6 +1169,11 @@ static inline void security_transfer_creds(struct cred *new,
 {
 }
 
+static inline void security_cred_getsecid(const struct cred *c, u32 *secid)
+{
+       *secid = 0;
+}
+
 static inline int security_kernel_act_as(struct cred *cred,
                                         struct lsmblob *blob)
 {