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

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
...@@ -233,12 +233,10 @@ static LLIST_HEAD(delayed_fput_list); ...@@ -233,12 +233,10 @@ static LLIST_HEAD(delayed_fput_list);
static void delayed_fput(struct work_struct *unused) static void delayed_fput(struct work_struct *unused)
{ {
struct llist_node *node = llist_del_all(&delayed_fput_list); struct llist_node *node = llist_del_all(&delayed_fput_list);
struct llist_node *next; struct file *f, *t;
for (; node; node = next) { llist_for_each_entry_safe(f, t, node, f_u.fu_llist)
next = llist_next(node); __fput(f);
__fput(llist_entry(node, struct file, f_u.fu_llist));
}
} }
static void ____fput(struct callback_head *work) static void ____fput(struct callback_head *work)
......
...@@ -1182,12 +1182,10 @@ static LLIST_HEAD(delayed_mntput_list); ...@@ -1182,12 +1182,10 @@ static LLIST_HEAD(delayed_mntput_list);
static void delayed_mntput(struct work_struct *unused) static void delayed_mntput(struct work_struct *unused)
{ {
struct llist_node *node = llist_del_all(&delayed_mntput_list); struct llist_node *node = llist_del_all(&delayed_mntput_list);
struct llist_node *next; struct mount *m, *t;
for (; node; node = next) { llist_for_each_entry_safe(m, t, node, mnt_llist)
next = llist_next(node); cleanup_mnt(m);
cleanup_mnt(llist_entry(node, struct mount, mnt_llist));
}
} }
static DECLARE_DELAYED_WORK(delayed_mntput_work, delayed_mntput); static DECLARE_DELAYED_WORK(delayed_mntput_work, delayed_mntput);
......
...@@ -75,10 +75,10 @@ static inline int __access_ok(unsigned long addr, unsigned long size) ...@@ -75,10 +75,10 @@ static inline int __access_ok(unsigned long addr, unsigned long size)
#define put_user(x, ptr) \ #define put_user(x, ptr) \
({ \ ({ \
void *__p = (ptr); \ void __user *__p = (ptr); \
might_fault(); \ might_fault(); \
access_ok(VERIFY_WRITE, __p, sizeof(*ptr)) ? \ access_ok(VERIFY_WRITE, __p, sizeof(*ptr)) ? \
__put_user((x), ((__typeof__(*(ptr)) *)__p)) : \ __put_user((x), ((__typeof__(*(ptr)) __user *)__p)) : \
-EFAULT; \ -EFAULT; \
}) })
...@@ -137,10 +137,10 @@ extern int __put_user_bad(void) __attribute__((noreturn)); ...@@ -137,10 +137,10 @@ extern int __put_user_bad(void) __attribute__((noreturn));
#define get_user(x, ptr) \ #define get_user(x, ptr) \
({ \ ({ \
const void *__p = (ptr); \ const void __user *__p = (ptr); \
might_fault(); \ might_fault(); \
access_ok(VERIFY_READ, __p, sizeof(*ptr)) ? \ 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); \ ((x) = (__typeof__(*(ptr)))0,-EFAULT); \
}) })
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment