From: Todd Kjos <tkjos@google.com>
To: stable@vger.kernel.org, gregkh@linuxfoundation.org,
arve@android.com, tkjos@android.com, maco@android.com,
christian@brauner.io, jmorris@namei.org, serge@hallyn.com,
paul@paul-moore.com, stephen.smalley.work@gmail.com,
eparis@parisplace.org, keescook@chromium.org, jannh@google.com,
jeffv@google.com, zohar@linux.ibm.com,
linux-security-module@vger.kernel.org, selinux@vger.kernel.org,
devel@driverdev.osuosl.org
Cc: joel@joelfernandes.org, kernel-team@android.com,
Todd Kjos <tkjos@google.com>, kernel test robot <lkp@intel.com>,
Casey Schaufler <casey@schaufler-ca.com>
Subject: [PATCH 5.10 3/3] binder: use cred instead of task for getsecid
Date: Wed, 10 Nov 2021 15:00:36 -0800 [thread overview]
Message-ID: <20211110230036.3274365-3-tkjos@google.com> (raw)
In-Reply-To: <20211110230036.3274365-1-tkjos@google.com>
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>
Change-Id: Ia7b59804a0bdbd51191bbcca556414840307c623
---
drivers/android/binder.c | 2 +-
include/linux/security.h | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 50fff726dc70..3ba3944a9e1f 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -3103,7 +3103,7 @@ static void binder_transaction(struct binder_proc *proc,
u32 secid;
size_t added_size;
- security_task_getsecid(proc->tsk, &secid);
+ security_cred_getsecid(proc->cred, &secid);
ret = security_secid_to_secctx(secid, &secctx, &secctx_sz);
if (ret) {
return_error = BR_FAILED_REPLY;
diff --git a/include/linux/security.h b/include/linux/security.h
index e67cc8c40865..35355429648e 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1003,6 +1003,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, u32 secid)
{
return 0;
--
2.34.0.rc0.344.g81b53c2807-goog
prev parent reply other threads:[~2021-11-10 23:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-10 23:00 [PATCH 5.10 1/3] binder: use euid from cred instead of using task Todd Kjos
2021-11-10 23:00 ` [PATCH 5.10 2/3] binder: use cred instead of task for selinux checks Todd Kjos
2021-11-10 23:00 ` Todd Kjos [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211110230036.3274365-3-tkjos@google.com \
--to=tkjos@google.com \
--cc=arve@android.com \
--cc=casey@schaufler-ca.com \
--cc=christian@brauner.io \
--cc=devel@driverdev.osuosl.org \
--cc=eparis@parisplace.org \
--cc=gregkh@linuxfoundation.org \
--cc=jannh@google.com \
--cc=jeffv@google.com \
--cc=jmorris@namei.org \
--cc=joel@joelfernandes.org \
--cc=keescook@chromium.org \
--cc=kernel-team@android.com \
--cc=linux-security-module@vger.kernel.org \
--cc=lkp@intel.com \
--cc=maco@android.com \
--cc=paul@paul-moore.com \
--cc=selinux@vger.kernel.org \
--cc=serge@hallyn.com \
--cc=stable@vger.kernel.org \
--cc=stephen.smalley.work@gmail.com \
--cc=tkjos@android.com \
--cc=zohar@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).