Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d2c5d6c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5593edfb

include/linux/kmod.h

+4 −3
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ struct file; 
struct subprocess_info {

	struct work_struct work;

	struct completion *complete;

	char *path;

	const char *path;

	char **argv;

	char **envp;

	int wait;
@@ -67,10 +67,11 @@ struct subprocess_info { 
};



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 *

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),

			  void (*cleanup)(struct subprocess_info *), void *data);

kernel/kmod.c

+2 −2
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ static void helper_unlock(void) 
 * Function must be runnable in either a process context or the

 * 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,

		int (*init)(struct subprocess_info *info, struct cred *new),

		void (*cleanup)(struct subprocess_info *info),
@@ -613,7 +613,7 @@ EXPORT_SYMBOL(call_usermodehelper_exec); 
 * This function is the equivalent to use call_usermodehelper_setup() and

 * 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;

	gfp_t gfp_mask = (wait == UMH_NO_WAIT) ? GFP_ATOMIC : GFP_KERNEL;