Please pull this fix for the Yama LSM by Jann Horn.
The following changes since commit 8c7ae38d1ce12a0eaeba655df8562552b3596c7f:
afs: Fix StoreData op marshalling (2019-03-28 08:54:20 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git fixes-v5.1
for you to fetch changes up to 1aa176ef5a451adc0546d5aaa3fb107975c786b7:
Yama: mark local symbols as static (2019-03-28 10:02:29 -0700)
----------------------------------------------------------------
Jann Horn (1):
Yama: mark local symbols as static
security/yama/yama_lsm.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
commit 1aa176ef5a451adc0546d5aaa3fb107975c786b7
Author: Jann Horn <[email protected]>
Date: Wed Mar 27 17:21:42 2019 -0700
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: Mukesh Ojha <[email protected]>
Signed-off-by: Mukesh Ojha <[email protected]>
Signed-off-by: Jann Horn <[email protected]>
[kees: merged similar static-ness fixes into a single patch]
Link: https://lkml.kernel.org/r/[email protected]
Link: https://lkml.kernel.org/r/[email protected]
Signed-off-by: Kees Cook <[email protected]>
Signed-off-by: James Morris <[email protected]>
diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c
index 57cc60722dd3..efac68556b45 100644
--- a/security/yama/yama_lsm.c
+++ b/security/yama/yama_lsm.c
@@ -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
* @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);
}
@@ -222,7 +222,7 @@ void yama_task_free(struct task_struct *task)
* Return 0 on success, -ve on error. -ENOSYS is returned when Yama
* 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)
{
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.
*/
-int yama_ptrace_traceme(struct task_struct *parent)
+static int yama_ptrace_traceme(struct task_struct *parent)
{
int rc = 0;
@@ -452,7 +452,7 @@ static int yama_dointvec_minmax(struct ctl_table *table, int write,
static int zero;
static int max_scope = YAMA_SCOPE_NO_ATTACH;
-struct ctl_path yama_sysctl_path[] = {
+static struct ctl_path yama_sysctl_path[] = {
{ .procname = "kernel", },
{ .procname = "yama", },
{ }
Please pull these fixes for v5.1.
The following changes since commit 8c7ae38d1ce12a0eaeba655df8562552b3596c7f:
afs: Fix StoreData op marshalling (2019-03-28 08:54:20 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git fixes-v5.1-a
for you to fetch changes up to 2623c4fbe2ad1341ff2d1e12410d0afdae2490ca:
LSM: Revive CONFIG_DEFAULT_SECURITY_* for "make oldconfig" (2019-03-29 14:08:49 -0700)
----------------------------------------------------------------
Jann Horn (1):
Yama: mark local symbols as static
Kees Cook (1):
LSM: Revive CONFIG_DEFAULT_SECURITY_* for "make oldconfig"
security/Kconfig | 38 ++++++++++++++++++++++++++++++++++++++
security/yama/yama_lsm.c | 8 ++++----
2 files changed, 42 insertions(+), 4 deletions(-)
The pull request you sent on Sat, 30 Mar 2019 08:12:07 +1100 (AEDT):
> git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git fixes-v5.1-a
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/12195302ee6c32cf3c0fa947e17303ce583d41c9
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker
The pull request you sent on Sat, 30 Mar 2019 05:10:48 +1100 (AEDT):
> git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git fixes-v5.1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/2623c4fbe2ad1341ff2d1e12410d0afdae2490ca
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker