提交 6d2c5d6c 编写于 作者: G Greg Kroah-Hartman

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
cleaning up the write-ability of argv and env later, that's going to
take more work, for much less gain...
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 5593edfb
...@@ -56,7 +56,7 @@ struct file; ...@@ -56,7 +56,7 @@ struct file;
struct subprocess_info { struct subprocess_info {
struct work_struct work; struct work_struct work;
struct completion *complete; struct completion *complete;
char *path; const char *path;
char **argv; char **argv;
char **envp; char **envp;
int wait; int wait;
...@@ -67,10 +67,11 @@ struct subprocess_info { ...@@ -67,10 +67,11 @@ struct subprocess_info {
}; };
extern int extern int
call_usermodehelper(char *path, char **argv, char **envp, int wait); call_usermodehelper(const char *path, char **argv, char **envp, int wait);
extern struct subprocess_info * extern struct subprocess_info *
call_usermodehelper_setup(char *path, char **argv, char **envp, gfp_t gfp_mask, call_usermodehelper_setup(const char *path, char **argv, char **envp,
gfp_t gfp_mask,
int (*init)(struct subprocess_info *info, struct cred *new), int (*init)(struct subprocess_info *info, struct cred *new),
void (*cleanup)(struct subprocess_info *), void *data); void (*cleanup)(struct subprocess_info *), void *data);
......
...@@ -516,7 +516,7 @@ static void helper_unlock(void) ...@@ -516,7 +516,7 @@ static void helper_unlock(void)
* Function must be runnable in either a process context or the * Function must be runnable in either a process context or the
* context in which call_usermodehelper_exec is called. * context in which call_usermodehelper_exec is called.
*/ */
struct subprocess_info *call_usermodehelper_setup(char *path, char **argv, struct subprocess_info *call_usermodehelper_setup(const char *path, char **argv,
char **envp, gfp_t gfp_mask, char **envp, gfp_t gfp_mask,
int (*init)(struct subprocess_info *info, struct cred *new), int (*init)(struct subprocess_info *info, struct cred *new),
void (*cleanup)(struct subprocess_info *info), void (*cleanup)(struct subprocess_info *info),
...@@ -613,7 +613,7 @@ EXPORT_SYMBOL(call_usermodehelper_exec); ...@@ -613,7 +613,7 @@ EXPORT_SYMBOL(call_usermodehelper_exec);
* This function is the equivalent to use call_usermodehelper_setup() and * This function is the equivalent to use call_usermodehelper_setup() and
* call_usermodehelper_exec(). * call_usermodehelper_exec().
*/ */
int call_usermodehelper(char *path, char **argv, char **envp, int wait) int call_usermodehelper(const char *path, char **argv, char **envp, int wait)
{ {
struct subprocess_info *info; struct subprocess_info *info;
gfp_t gfp_mask = (wait == UMH_NO_WAIT) ? GFP_ATOMIC : GFP_KERNEL; gfp_t gfp_mask = (wait == UMH_NO_WAIT) ? GFP_ATOMIC : GFP_KERNEL;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册