Commit ec2ffdf6 authored by Alexei Starovoitov's avatar Alexei Starovoitov
Browse files

Merge branch 'usermode-driver-cleanup' of... 

Merge branch 'usermode-driver-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace into bpf-next
parents 11bb2f7a f06b71fe

fs/exec.c

+9 −29
Original line number Diff line number Diff line
@@ -1818,13 +1818,14 @@ static int exec_binprm(struct linux_binprm *bprm) 
/*

 * sys_execve() executes a new program.

 */

static int __do_execve_file(int fd, struct filename *filename,

static int do_execveat_common(int fd, struct filename *filename,

			      struct user_arg_ptr argv,

			      struct user_arg_ptr envp,

			    int flags, struct file *file)

			      int flags)

{

	char *pathbuf = NULL;

	struct linux_binprm *bprm;

	struct file *file;

	struct files_struct *displaced;

	int retval;
@@ -1863,7 +1864,6 @@ static int __do_execve_file(int fd, struct filename *filename, 
	check_unsafe_exec(bprm);

	current->in_execve = 1;



	if (!file)

	file = do_open_execat(fd, filename, flags);

	retval = PTR_ERR(file);

	if (IS_ERR(file))
@@ -1872,9 +1872,7 @@ static int __do_execve_file(int fd, struct filename *filename, 
	sched_exec();



	bprm->file = file;

	if (!filename) {

		bprm->filename = "none";

	} else if (fd == AT_FDCWD || filename->name[0] == '/') {

	if (fd == AT_FDCWD || filename->name[0] == '/') {

		bprm->filename = filename->name;

	} else {

		if (filename->name[0] == '\0')
@@ -1935,7 +1933,6 @@ static int __do_execve_file(int fd, struct filename *filename, 
	task_numa_free(current, false);

	free_bprm(bprm);

	kfree(pathbuf);

	if (filename)

	putname(filename);

	if (displaced)

		put_files_struct(displaced);
@@ -1967,27 +1964,10 @@ static int __do_execve_file(int fd, struct filename *filename, 
	if (displaced)

		reset_files_struct(displaced);

out_ret:

	if (filename)

	putname(filename);

	return retval;

}



static int do_execveat_common(int fd, struct filename *filename,

			      struct user_arg_ptr argv,

			      struct user_arg_ptr envp,

			      int flags)

{

	return __do_execve_file(fd, filename, argv, envp, flags, NULL);

}



int do_execve_file(struct file *file, void *__argv, void *__envp)

{

	struct user_arg_ptr argv = { .ptr.native = __argv };

	struct user_arg_ptr envp = { .ptr.native = __envp };



	return __do_execve_file(AT_FDCWD, NULL, argv, envp, 0, file);

}



int do_execve(struct filename *filename,

	const char __user *const __user *__argv,

	const char __user *const __user *__envp)

include/linux/binfmts.h

+0 −1
Original line number Diff line number Diff line
@@ -141,6 +141,5 @@ extern int do_execveat(int, struct filename *, 
		       const char __user * const __user *,

		       const char __user * const __user *,

		       int);

int do_execve_file(struct file *file, void *__argv, void *__envp);



#endif /* _LINUX_BINFMTS_H */

include/linux/bpfilter.h

+4 −3
Original line number Diff line number Diff line
@@ -3,22 +3,23 @@ 
#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,

			    unsigned int optlen);

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

			    int __user *optlen);

void bpfilter_umh_cleanup(struct umd_info *info);



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,

		       char __user *optval,

		       unsigned int optlen, bool is_set);

	int (*start)(void);

	bool stop;

};

extern struct bpfilter_umh_ops bpfilter_ops;

#endif

include/linux/sched.h

+0 −9
Original line number Diff line number Diff line
@@ -1510,7 +1510,6 @@ extern struct pid *cad_pid; 
#define PF_KTHREAD		0x00200000	/* I am a kernel thread */

#define PF_RANDOMIZE		0x00400000	/* Randomize virtual address space */

#define PF_SWAPWRITE		0x00800000	/* Allowed to write to swap */

#define PF_UMH			0x02000000	/* I'm an Usermodehelper process */

#define PF_NO_SETAFFINITY	0x04000000	/* Userland is not allowed to meddle with cpus_mask */

#define PF_MCE_EARLY		0x08000000      /* Early kill for mce process policy */

#define PF_MEMALLOC_NOCMA	0x10000000	/* All allocation request will have _GFP_MOVABLE cleared */
@@ -2019,14 +2018,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/sched/signal.h

+2 −0
Original line number Diff line number Diff line
@@ -674,6 +674,8 @@ static inline int thread_group_empty(struct task_struct *p) 
#define delay_group_leader(p) \

		(thread_group_leader(p) && !thread_group_empty(p))



extern bool thread_group_exited(struct pid *pid);



extern struct sighand_struct *__lock_task_sighand(struct task_struct *task,

							unsigned long *flags);