aboutsummaryrefslogtreecommitdiffstats
path: root/0001-kmod-make-usermodehelper-path-a-const-string.patch
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-16 16:38:47 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-16 16:38:47 +0100
commit137d9a2caad76b7ebfa137a3629e6ee2d77a006f (patch)
tree114b5b229745ba816face035b3bbd91ca692b418 /0001-kmod-make-usermodehelper-path-a-const-string.patch
parent6680ebc7a39c4a9661004adb6c8f4abc98fa6322 (diff)
downloadpatches-137d9a2caad76b7ebfa137a3629e6ee2d77a006f.tar.gz
updates
Diffstat (limited to '0001-kmod-make-usermodehelper-path-a-const-string.patch')
-rw-r--r--0001-kmod-make-usermodehelper-path-a-const-string.patch15
1 files changed, 11 insertions, 4 deletions
diff --git a/0001-kmod-make-usermodehelper-path-a-const-string.patch b/0001-kmod-make-usermodehelper-path-a-const-string.patch
index d7a9f87974dcf0..a9ce3a81000c75 100644
--- a/0001-kmod-make-usermodehelper-path-a-const-string.patch
+++ b/0001-kmod-make-usermodehelper-path-a-const-string.patch
@@ -1,7 +1,7 @@
-From 359179eb6145c5982a958367197ca4b785b6b15f Mon Sep 17 00:00:00 2001
+From 6f5842372bb2438cdf3b37fa2727688033121b9e Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 11 Dec 2016 09:44:42 +0100
-Subject: [PATCH 1/4] kmod: make usermodehelper path a const string
+Subject: [PATCH 1/5] kmod: make usermodehelper path a const string
This is in preparation for making it so that usermode helper programs
can't be changed, if desired, by userspace. We will tackle the mess of
@@ -10,10 +10,12 @@ take more work, for much less gain...
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
- include/linux/kmod.h | 7 ++++---
- kernel/kmod.c | 4 ++--
+ include/linux/kmod.h | 7 ++++---
+ kernel/kmod.c | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
+diff --git a/include/linux/kmod.h b/include/linux/kmod.h
+index fcfd2bf14d3f..c4e441e00db5 100644
--- a/include/linux/kmod.h
+++ b/include/linux/kmod.h
@@ -56,7 +56,7 @@ struct file;
@@ -39,6 +41,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
int (*init)(struct subprocess_info *info, struct cred *new),
void (*cleanup)(struct subprocess_info *), void *data);
+diff --git a/kernel/kmod.c b/kernel/kmod.c
+index d45c96073afb..426a614e97fe 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -516,7 +516,7 @@ static void helper_unlock(void)
@@ -59,3 +63,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
{
struct subprocess_info *info;
gfp_t gfp_mask = (wait == UMH_NO_WAIT) ? GFP_ATOMIC : GFP_KERNEL;
+--
+2.11.0
+