diff options
| author | Ben Hutchings <benh@debian.org> | 2015-08-04 01:30:23 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2015-08-04 01:30:23 +0000 |
| commit | 79f636b4bf7edcbf7c4194b93e4c4fef43b13e1c (patch) | |
| tree | 4a4c8ce3b582dc8392976e7be9d131aeca31f555 /debian/patches/debian/yama-disable-by-default.patch | |
| parent | f2378f0aa3815533e3d0e1b06fec1a02f33f26fc (diff) | |
Update to 4.2-rc5
Refresh/drop patches as needed.
svn path=/dists/trunk/linux/; revision=22909
Diffstat (limited to 'debian/patches/debian/yama-disable-by-default.patch')
| -rw-r--r-- | debian/patches/debian/yama-disable-by-default.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches/debian/yama-disable-by-default.patch b/debian/patches/debian/yama-disable-by-default.patch index f217a22b3..8477b5678 100644 --- a/debian/patches/debian/yama-disable-by-default.patch +++ b/debian/patches/debian/yama-disable-by-default.patch @@ -15,12 +15,12 @@ Forwarded: not-needed /* describe a ptrace relationship for potential exception */ struct ptrace_relation { -@@ -425,7 +425,7 @@ static __init int yama_init(void) +@@ -407,7 +407,7 @@ static __init int yama_init(void) + if (!security_module_enable("yama")) return 0; #endif +- pr_info("Yama: becoming mindful.\n"); ++ pr_info("Yama: disabled by default; enable with sysctl kernel.yama.*\n"); -- printk(KERN_INFO "Yama: becoming mindful.\n"); -+ printk(KERN_INFO "Yama: disabled by default; enable with sysctl kernel.yama.*\n"); - - #ifndef CONFIG_SECURITY_YAMA_STACKED - if (register_security(&yama_ops)) + #ifdef CONFIG_SYSCTL + if (!register_sysctl_paths(yama_sysctl_path, yama_sysctl_table)) |