Commit 74be2d3b authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

umd: For clarity rename umh_info umd_info 

This structure is only used for user mode drivers so change
the prefix from umh to umd to make that clear.

v1: https://lkml.kernel.org/r/87o8p6f0kw.fsf_-_@x220.int.ebiederm.org
v2: https://lkml.kernel.org/r/878sg563po.fsf_-_@x220.int.ebiederm.org
Link: https://lkml.kernel.org/r/20200702164140.4468-6-ebiederm@xmission.com


Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Tested-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 884c5e68

include/linux/bpfilter.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ int bpfilter_ip_set_sockopt(struct sock *sk, int optname, char __user *optval, 
int bpfilter_ip_get_sockopt(struct sock *sk, int optname, char __user *optval,

			    int __user *optlen);

struct bpfilter_umh_ops {

	struct umh_info info;

	struct umd_info info;

	/* since ip_getsockopt() can run in parallel, serialize access to umh */

	struct mutex lock;

	int (*sockopt)(struct sock *sk, int optname,

include/linux/usermode_driver.h

+3 −3
Original line number Diff line number Diff line
@@ -17,14 +17,14 @@ static inline void exit_umh(struct task_struct *tsk) 
}

#endif



struct umh_info {

struct umd_info {

	const char *cmdline;

	struct file *pipe_to_umh;

	struct file *pipe_from_umh;

	struct list_head list;

	void (*cleanup)(struct umh_info *info);

	void (*cleanup)(struct umd_info *info);

	pid_t pid;

};

int fork_usermode_blob(void *data, size_t len, struct umh_info *info);

int fork_usermode_blob(void *data, size_t len, struct umd_info *info);



#endif /* __LINUX_USERMODE_DRIVER_H__ */

kernel/usermode_driver.c

+10 −10
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ static DEFINE_MUTEX(umh_list_lock); 


static int umd_setup(struct subprocess_info *info, struct cred *new)

{

	struct umh_info *umh_info = info->data;

	struct umd_info *umd_info = info->data;

	struct file *from_umh[2];

	struct file *to_umh[2];

	int err;
@@ -43,21 +43,21 @@ static int umd_setup(struct subprocess_info *info, struct cred *new) 
		return err;

	}



	umh_info->pipe_to_umh = to_umh[1];

	umh_info->pipe_from_umh = from_umh[0];

	umh_info->pid = task_pid_nr(current);

	umd_info->pipe_to_umh = to_umh[1];

	umd_info->pipe_from_umh = from_umh[0];

	umd_info->pid = task_pid_nr(current);

	current->flags |= PF_UMH;

	return 0;

}



static void umd_cleanup(struct subprocess_info *info)

{

	struct umh_info *umh_info = info->data;

	struct umd_info *umd_info = info->data;



	/* cleanup if umh_setup() was successful but exec failed */

	if (info->retval) {

		fput(umh_info->pipe_to_umh);

		fput(umh_info->pipe_from_umh);

		fput(umd_info->pipe_to_umh);

		fput(umd_info->pipe_from_umh);

	}

}
@@ -72,12 +72,12 @@ static void umd_cleanup(struct subprocess_info *info) 
 *

 * Returns either negative error or zero which indicates success

 * in executing a blob of bytes as a usermode process. In such

 * case 'struct umh_info *info' is populated with two pipes

 * case 'struct umd_info *info' is populated with two pipes

 * and a pid of the process. The caller is responsible for health

 * check of the user process, killing it via pid, and closing the

 * pipes when user process is no longer needed.

 */

int fork_usermode_blob(void *data, size_t len, struct umh_info *info)

int fork_usermode_blob(void *data, size_t len, struct umd_info *info)

{

	const char *cmdline = (info->cmdline) ? info->cmdline : "usermodehelper";

	struct subprocess_info *sub_info;
@@ -126,7 +126,7 @@ EXPORT_SYMBOL_GPL(fork_usermode_blob); 


void __exit_umh(struct task_struct *tsk)

{

	struct umh_info *info;

	struct umd_info *info;

	pid_t pid = tsk->pid;



	mutex_lock(&umh_list_lock);

net/ipv4/bpfilter/sockopt.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
struct bpfilter_umh_ops bpfilter_ops;

EXPORT_SYMBOL_GPL(bpfilter_ops);



static void bpfilter_umh_cleanup(struct umh_info *info)

static void bpfilter_umh_cleanup(struct umd_info *info)

{

	mutex_lock(&bpfilter_ops.lock);

	bpfilter_ops.stop = true;

CRA Git | Maintained and supported by SUSTech CRA and CCSE