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

Commit 9e0ce554 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull misc leftovers from Al Viro.

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix the __user misannotations in asm-generic get_user/put_user
  fput: Don't reinvent the wheel but use existing llist API
  namespace.c: Don't reinvent the wheel but use existing llist API
parents e253d98f 1985296a

fs/file_table.c

+5 −7
Original line number Diff line number Diff line
@@ -233,12 +233,10 @@ static LLIST_HEAD(delayed_fput_list); 
static void delayed_fput(struct work_struct *unused)

{

	struct llist_node *node = llist_del_all(&delayed_fput_list);

	struct llist_node *next;

	struct file *f, *t;



	for (; node; node = next) {

		next = llist_next(node);

		__fput(llist_entry(node, struct file, f_u.fu_llist));

	}

	llist_for_each_entry_safe(f, t, node, f_u.fu_llist)

		__fput(f);

}



static void ____fput(struct callback_head *work)

fs/namespace.c

+3 −5
Original line number Diff line number Diff line
@@ -1182,12 +1182,10 @@ static LLIST_HEAD(delayed_mntput_list); 
static void delayed_mntput(struct work_struct *unused)

{

	struct llist_node *node = llist_del_all(&delayed_mntput_list);

	struct llist_node *next;

	struct mount *m, *t;



	for (; node; node = next) {

		next = llist_next(node);

		cleanup_mnt(llist_entry(node, struct mount, mnt_llist));

	}

	llist_for_each_entry_safe(m, t, node, mnt_llist)

		cleanup_mnt(m);

}

static DECLARE_DELAYED_WORK(delayed_mntput_work, delayed_mntput);

include/asm-generic/uaccess.h

+4 −4
Original line number Diff line number Diff line
@@ -75,10 +75,10 @@ static inline int __access_ok(unsigned long addr, unsigned long size) 


#define put_user(x, ptr)					\

({								\

	void *__p = (ptr);					\

	void __user *__p = (ptr);				\

	might_fault();						\

	access_ok(VERIFY_WRITE, __p, sizeof(*ptr)) ?		\

		__put_user((x), ((__typeof__(*(ptr)) *)__p)) :	\

		__put_user((x), ((__typeof__(*(ptr)) __user *)__p)) :	\

		-EFAULT;					\

})
@@ -137,10 +137,10 @@ extern int __put_user_bad(void) __attribute__((noreturn)); 


#define get_user(x, ptr)					\

({								\

	const void *__p = (ptr);				\

	const void __user *__p = (ptr);				\

	might_fault();						\

	access_ok(VERIFY_READ, __p, sizeof(*ptr)) ?		\

		__get_user((x), (__typeof__(*(ptr)) *)__p) :	\

		__get_user((x), (__typeof__(*(ptr)) __user *)__p) :\

		((x) = (__typeof__(*(ptr)))0,-EFAULT);		\

})