summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-10-10 13:08:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-10-10 13:08:59 -0700
commita957fd420ca8774f1a6708c64a867f056e67c46e (patch)
tree25ee7fceb4506ae65077b27c3e7239654556dee3 /kernel
parentf953d2481e1db0265c5ed69489570377d91d92e6 (diff)
parent084f5601c357e4ee59cf0712200d3f5c4710ba40 (diff)
downloadlinux-a957fd420ca8774f1a6708c64a867f056e67c46e.tar.gz
linux-a957fd420ca8774f1a6708c64a867f056e67c46e.tar.bz2
linux-a957fd420ca8774f1a6708c64a867f056e67c46e.zip
Merge tag 'seccomp-v4.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull seccomp fixlet from Kees Cook: "Minor seccomp fix for v4.14-rc5. I debated sending this at all for v4.14, but since it fixes a minor issue in the prior fix, which also went to -stable, it seemed better to just get all of it cleaned up right now. - fix missed "static" to avoid Sparse warning (Colin King)" * tag 'seccomp-v4.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: seccomp: make function __get_seccomp_filter static
Diffstat (limited to 'kernel')
-rw-r--r--kernel/seccomp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/seccomp.c b/kernel/seccomp.c
index bb3a38005b9c..0ae832e13b97 100644
--- a/kernel/seccomp.c
+++ b/kernel/seccomp.c
@@ -473,7 +473,7 @@ static long seccomp_attach_filter(unsigned int flags,
return 0;
}
-void __get_seccomp_filter(struct seccomp_filter *filter)
+static void __get_seccomp_filter(struct seccomp_filter *filter)
{
/* Reference count is bounded by the number of total processes. */
refcount_inc(&filter->usage);