Messages in this thread Patch in this message | | | From | Christian Brauner <> | Subject | [PATCH v1 09/20] signal: make kill_ok_by_cred() return bool | Date | Mon, 28 May 2018 23:53:44 +0200 |
| |
kill_ok_by_cred() already behaves like a boolean function. Let's actually declare it as such too.
Signed-off-by: Christian Brauner <christian@brauner.io> --- v0->v1: * patch introduced --- kernel/signal.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/kernel/signal.c b/kernel/signal.c index 7095fa11af15..faef85bb243e 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -723,21 +723,16 @@ static inline bool si_fromuser(const struct siginfo *info) /* * called with RCU read lock from check_kill_permission() */ -static int kill_ok_by_cred(struct task_struct *t) +static bool kill_ok_by_cred(struct task_struct *t) { const struct cred *cred = current_cred(); const struct cred *tcred = __task_cred(t); - if (uid_eq(cred->euid, tcred->suid) || - uid_eq(cred->euid, tcred->uid) || - uid_eq(cred->uid, tcred->suid) || - uid_eq(cred->uid, tcred->uid)) - return 1; - - if (ns_capable(tcred->user_ns, CAP_KILL)) - return 1; - - return 0; + return uid_eq(cred->euid, tcred->suid) || + uid_eq(cred->euid, tcred->uid) || + uid_eq(cred->uid, tcred->suid) || + uid_eq(cred->uid, tcred->uid) || + ns_capable(tcred->user_ns, CAP_KILL); } /* -- 2.17.0
| |