futex fix
Linus,
Please pull the latest core-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core-fixes-for-linus
Thanks,
Ingo
------------------>
KOSAKI Motohiro (1):
futexes: Remove rw parameter from get_futex_key()
kernel/futex.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-)
kernel/futex.c +12 -15
@@ -203,8 +203,6 @@ static void drop_futex_key_refs(union futex_key *key)* @uaddr: virtual address of the futex * @fshared: 0 for a PROCESS_PRIVATE futex, 1 for PROCESS_SHARED * @key: address where result is stored. -* @rw: mapping needs to be read/write (values: VERIFY_READ, -* VERIFY_WRITE) * * Returns a negative error code or 0 * The key words are stored in *key on success.
@@ -216,7 +214,7 @@ static void drop_futex_key_refs(union futex_key *key)* lock_page() might sleep, the caller should not hold a spinlock. */ static int -get_futex_key (u32 __user *uaddr,int fshared,union futex_key *key,int rw) +get_futex_key (u32 __user *uaddr,int fshared,union futex_key *key) {unsigned long address = (unsigned long )uaddr;struct mm_struct *mm = current->mm;
@@ -239,7 +237,7 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)* but access_ok() should be faster than find_vma() */ if (!fshared) { -if (unlikely (!access_ok (rw, uaddr,sizeof (u32)))) +if (unlikely (!access_ok (VERIFY_WRITE , uaddr,sizeof (u32))))return -EFAULT ; key->private.mm = mm; key->private.address = address;
@@ -248,7 +246,7 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw) } again: - err =get_user_pages_fast (address,1 , rw ==VERIFY_WRITE , &page); + err =get_user_pages_fast (address,1 ,1 , &page);if (err <0 )return err;
@@ -867,7 +865,7 @@ static int futex_wake(u32 __user *uaddr, int fshared, int nr_wake, u32 bitset)if (!bitset)return -EINVAL ; - ret =get_futex_key (uaddr, fshared, &key,VERIFY_READ ); + ret =get_futex_key (uaddr, fshared, &key);if (unlikely (ret !=0 )) goto out;
@@ -913,10 +911,10 @@ futex_wake_op(u32 __user *uaddr1, int fshared, u32 __user *uaddr2,int ret, op_ret; retry: - ret =get_futex_key (uaddr1, fshared, &key1,VERIFY_READ ); + ret =get_futex_key (uaddr1, fshared, &key1);if (unlikely (ret !=0 )) goto out; - ret =get_futex_key (uaddr2, fshared, &key2,VERIFY_WRITE ); + ret =get_futex_key (uaddr2, fshared, &key2);if (unlikely (ret !=0 )) goto out_put_key1;
@@ -1175,11 +1173,10 @@ retry: pi_state =NULL ; } - ret =get_futex_key (uaddr1, fshared, &key1,VERIFY_READ ); + ret =get_futex_key (uaddr1, fshared, &key1);if (unlikely (ret !=0 )) goto out; - ret =get_futex_key (uaddr2, fshared, &key2, - requeue_pi ?VERIFY_WRITE :VERIFY_READ ); + ret =get_futex_key (uaddr2, fshared, &key2);if (unlikely (ret !=0 )) goto out_put_key1;
@@ -1738,7 +1735,7 @@ static int futex_wait_setup(u32 __user *uaddr, u32 val, int fshared,*/ retry: q->key =FUTEX_KEY_INIT ; - ret =get_futex_key (uaddr, fshared, &q->key,VERIFY_READ ); + ret =get_futex_key (uaddr, fshared, &q->key);if (unlikely (ret !=0 ))return ret;
@@ -1904,7 +1901,7 @@ static int futex_lock_pi(u32 __user *uaddr, int fshared, q.requeue_pi_key =NULL ; retry: q.key =FUTEX_KEY_INIT ; - ret =get_futex_key (uaddr, fshared, &q.key,VERIFY_WRITE ); + ret =get_futex_key (uaddr, fshared, &q.key);if (unlikely (ret !=0 )) goto out;
@@ -2023,7 +2020,7 @@ retry:if ((uval &FUTEX_TID_MASK ) !=task_pid_vnr (current))return -EPERM ; - ret =get_futex_key (uaddr, fshared, &key,VERIFY_WRITE ); + ret =get_futex_key (uaddr, fshared, &key);if (unlikely (ret !=0 )) goto out;
@@ -2215,7 +2212,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, int fshared, rt_waiter.task =NULL ; key2 =FUTEX_KEY_INIT ; - ret =get_futex_key (uaddr2, fshared, &key2,VERIFY_WRITE ); + ret =get_futex_key (uaddr2, fshared, &key2);if (unlikely (ret !=0 )) goto out;