Commit 1aa176ef authored by Jann Horn's avatar Jann Horn Committed by James Morris
Browse files

Yama: mark local symbols as static 



sparse complains that Yama defines functions and a variable as non-static
even though they don't exist in any header. Fix it by making them static.

Co-developed-by: default avatarMukesh Ojha <mojha@codeaurora.org>
Signed-off-by: default avatarMukesh Ojha <mojha@codeaurora.org>
Signed-off-by: default avatarJann Horn <jannh@google.com>
[kees: merged similar static-ness fixes into a single patch]
Link: https://lkml.kernel.org/r/20190326230841.87834-1-jannh@google.com
Link: https://lkml.kernel.org/r/1553673018-19234-1-git-send-email-mojha@codeaurora.org


Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarJames Morris <james.morris@microsoft.com>
parent 8c7ae38d

security/yama/yama_lsm.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -206,7 +206,7 @@ static void yama_ptracer_del(struct task_struct *tracer, 
 * yama_task_free - check for task_pid to remove from exception list

 * yama_task_free - check for task_pid to remove from exception list

 * @task: task being removed

 * @task: task being removed

 */

 */

void yama_task_free(struct task_struct *task)

static void yama_task_free(struct task_struct *task)

{

{

	yama_ptracer_del(task, task);

	yama_ptracer_del(task, task);

}

}
@@ -222,7 +222,7 @@ void yama_task_free(struct task_struct *task) 
 * Return 0 on success, -ve on error.  -ENOSYS is returned when Yama

 * Return 0 on success, -ve on error.  -ENOSYS is returned when Yama

 * does not handle the given option.

 * does not handle the given option.

 */

 */

int yama_task_prctl(int option, unsigned long arg2, unsigned long arg3,

static int yama_task_prctl(int option, unsigned long arg2, unsigned long arg3,

			   unsigned long arg4, unsigned long arg5)

			   unsigned long arg4, unsigned long arg5)

{

{

	int rc = -ENOSYS;

	int rc = -ENOSYS;
@@ -401,7 +401,7 @@ static int yama_ptrace_access_check(struct task_struct *child, 
 *

 *

 * Returns 0 if following the ptrace is allowed, -ve on error.

 * Returns 0 if following the ptrace is allowed, -ve on error.

 */

 */

int yama_ptrace_traceme(struct task_struct *parent)

static int yama_ptrace_traceme(struct task_struct *parent)

{

{

	int rc = 0;

	int rc = 0;
@@ -452,7 +452,7 @@ static int yama_dointvec_minmax(struct ctl_table *table, int write, 
static int zero;

static int zero;

static int max_scope = YAMA_SCOPE_NO_ATTACH;

static int max_scope = YAMA_SCOPE_NO_ATTACH;





struct ctl_path yama_sysctl_path[] = {

static struct ctl_path yama_sysctl_path[] = {

	{ .procname = "kernel", },

	{ .procname = "kernel", },

	{ .procname = "yama", },

	{ .procname = "yama", },

	{ }

	{ }

CRA Git | Maintained and supported by SUSTech CRA and CCSE