summaryrefslogtreecommitdiff
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-12-04 10:49:55 +0000
committerMark Brown <broonie@kernel.org>2018-12-04 10:49:55 +0000
commit684d5e05df8cdc18791e76b11f6bc85ecd4d9416 (patch)
tree4c4f0ab4a18b95acab9bc2816e80b4a5ddc9b985 /kernel/sysctl.c
parent375fef4f04334199a0759ad7ac2572060122a189 (diff)
parent56ccc3f7a7ee1f0ab64453794ebbc7d9a4c8ddf7 (diff)
Merge tag 'v4.4.166' into linux-linaro-lsk-v4.4
This is the 4.4.166 stable release
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r--kernel/sysctl.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 66100d1bc3f7..7e832f9a8f42 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1716,6 +1716,24 @@ static struct ctl_table fs_table[] = {
.extra2 = &one,
},
{
+ .procname = "protected_fifos",
+ .data = &sysctl_protected_fifos,
+ .maxlen = sizeof(int),
+ .mode = 0600,
+ .proc_handler = proc_dointvec_minmax,
+ .extra1 = &zero,
+ .extra2 = &two,
+ },
+ {
+ .procname = "protected_regular",
+ .data = &sysctl_protected_regular,
+ .maxlen = sizeof(int),
+ .mode = 0600,
+ .proc_handler = proc_dointvec_minmax,
+ .extra1 = &zero,
+ .extra2 = &two,
+ },
+ {
.procname = "suid_dumpable",
.data = &suid_dumpable,
.maxlen = sizeof(int),