Commit 884c5e68 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

umh: Separate the user mode driver and the user mode helper support 

This makes it clear which code is part of the core user mode
helper support and which code is needed to implement user mode
drivers.

This makes the kernel smaller for everyone who does not use a usermode
driver.

v1: https://lkml.kernel.org/r/87tuyyf0ln.fsf_-_@x220.int.ebiederm.org
v2: https://lkml.kernel.org/r/87imf963s6.fsf_-_@x220.int.ebiederm.org
Link: https://lkml.kernel.org/r/20200702164140.4468-5-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 21d59828

include/linux/bpfilter.h

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#define _LINUX_BPFILTER_H



#include <uapi/linux/bpfilter.h>

#include <linux/umh.h>

#include <linux/usermode_driver.h>



struct sock;

int bpfilter_ip_set_sockopt(struct sock *sk, int optname, char __user *optval,

include/linux/sched.h

+0 −8
Original line number Diff line number Diff line
@@ -2020,14 +2020,6 @@ static inline void rseq_execve(struct task_struct *t) 


#endif



void __exit_umh(struct task_struct *tsk);



static inline void exit_umh(struct task_struct *tsk)

{

	if (unlikely(tsk->flags & PF_UMH))

		__exit_umh(tsk);

}



#ifdef CONFIG_DEBUG_RSEQ



void rseq_syscall(struct pt_regs *regs);

include/linux/umh.h

+0 −10
Original line number Diff line number Diff line
@@ -39,16 +39,6 @@ call_usermodehelper_setup(const char *path, char **argv, char **envp, 
			  int (*init)(struct subprocess_info *info, struct cred *new),

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



struct umh_info {

	const char *cmdline;

	struct file *pipe_to_umh;

	struct file *pipe_from_umh;

	struct list_head list;

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

	pid_t pid;

};

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



extern int

call_usermodehelper_exec(struct subprocess_info *info, int wait);

include/linux/usermode_driver.h

0 → 100644
+30 −0
Original line number Diff line number Diff line 
#ifndef __LINUX_USERMODE_DRIVER_H__

#define __LINUX_USERMODE_DRIVER_H__



#include <linux/umh.h>



#ifdef CONFIG_BPFILTER

void __exit_umh(struct task_struct *tsk);



static inline void exit_umh(struct task_struct *tsk)

{

	if (unlikely(tsk->flags & PF_UMH))

		__exit_umh(tsk);

}

#else

static inline void exit_umh(struct task_struct *tsk)

{

}

#endif



struct umh_info {

	const char *cmdline;

	struct file *pipe_to_umh;

	struct file *pipe_from_umh;

	struct list_head list;

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

	pid_t pid;

};

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



#endif /* __LINUX_USERMODE_DRIVER_H__ */

kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ obj-y = fork.o exec_domain.o panic.o \ 
	    notifier.o ksysfs.o cred.o reboot.o \

	    async.o range.o smpboot.o ucount.o



obj-$(CONFIG_BPFILTER) += usermode_driver.o

obj-$(CONFIG_MODULES) += kmod.o

obj-$(CONFIG_MULTIUSER) += groups.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE