abfc7935e825811354141a59fad6cce30d16cc1c Issues on futex.c files. kernel/futex.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/kernel/futex.c b/kernel/futex.c index c20f06f..04a7082 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -389,10 +389,10 @@ static struct futex_hash_bucket *hash_futex(union futex_key *key) */ static inline int match_futex(union futex_key *key1, union futex_key *key2) { - return (key1 && key2 - && key1->both.word == key2->both.word - && key1->both.ptr == key2->both.ptr - && key1->both.offset == key2->both.offset); + return ((key1 && key2) + && (key1->both.word == key2->both.word) + && (key1->both.ptr == key2->both.ptr) + && (key1->both.offset == key2->both.offset)); } /* @@ -511,7 +511,7 @@ again: * If write access is not required (eg. FUTEX_WAIT), try * and get read-only access. */ - if (err == -EFAULT && rw == VERIFY_READ) { + if ((err == -EFAULT) && (rw == VERIFY_READ)) { err = get_user_pages_fast(address, 1, 0, &page); ro = 1; } @@ -1701,10 +1701,10 @@ static int futex_requeue(u32 __user *uaddr1, unsigned int flags, } retry: - ret = get_futex_key(uaddr1, flags & FLAGS_SHARED, &key1, VERIFY_READ); + ret = get_futex_key(uaddr1, (flags & FLAGS_SHARED), &key1, VERIFY_READ); if (unlikely(ret != 0)) goto out; - ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, + ret = get_futex_key(uaddr2, (flags & FLAGS_SHARED), &key2, requeue_pi ? VERIFY_WRITE : VERIFY_READ); if (unlikely(ret != 0)) goto out_put_key1; @@ -1751,7 +1751,7 @@ retry_private: } } - if (requeue_pi && (task_count - nr_wake < nr_requeue)) { + if (requeue_pi && ((task_count - nr_wake) < nr_requeue)) { /* * Attempt to acquire uaddr2 and wake the top waiter. If we * intend to requeue waiters, force setting the FUTEX_WAITERS @@ -1823,7 +1823,7 @@ retry_private: } plist_for_each_entry_safe(this, next, &hb1->chain, list) { - if (task_count - nr_wake >= nr_requeue) + if ((task_count - nr_wake) >= nr_requeue) break; if (!match_futex(&this->key, &key1)) @@ -1848,7 +1848,7 @@ retry_private: * lock, we already woke the top_waiter. If not, it will be * woken by futex_unlock_pi(). */ - if (++task_count <= nr_wake && !requeue_pi) { + if ((++task_count <= nr_wake) && !requeue_pi) { mark_wake_futex(&wake_q, this); continue; } @@ -2327,7 +2327,7 @@ static int futex_wait_setup(u32 __user *uaddr, u32 val, unsigned int flags, * while the syscall executes. */ retry: - ret = get_futex_key(uaddr, flags & FLAGS_SHARED, &q->key, VERIFY_READ); + ret = get_futex_key(uaddr, (flags & FLAGS_SHARED), &q->key, VERIFY_READ); if (unlikely(ret != 0)) return ret; @@ -2481,7 +2481,7 @@ static int futex_lock_pi(u32 __user *uaddr, unsigned int flags, } retry: - ret = get_futex_key(uaddr, flags & FLAGS_SHARED, &q.key, VERIFY_WRITE); + ret = get_futex_key(uaddr, (flags & FLAGS_SHARED), &q.key, VERIFY_WRITE); if (unlikely(ret != 0)) goto out; @@ -2605,7 +2605,7 @@ retry: if ((uval & FUTEX_TID_MASK) != vpid) return -EPERM; - ret = get_futex_key(uaddr, flags & FLAGS_SHARED, &key, VERIFY_WRITE); + ret = get_futex_key(uaddr, (flags & FLAGS_SHARED), &key, VERIFY_WRITE); if (ret) return ret; @@ -2806,7 +2806,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, RB_CLEAR_NODE(&rt_waiter.tree_entry); rt_waiter.task = NULL; - ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, VERIFY_WRITE); + ret = get_futex_key(uaddr2, (flags & FLAGS_SHARED), &key2, VERIFY_WRITE); if (unlikely(ret != 0)) goto out; @@ -3123,7 +3123,7 @@ void exit_robust_list(struct task_struct *curr) * don't process it twice: */ if (entry != pending) - if (handle_futex_death((void __user *)entry + futex_offset, + if (handle_futex_death(((void __user *)entry + futex_offset), curr, pi)) return; if (rc) @@ -3140,7 +3140,7 @@ void exit_robust_list(struct task_struct *curr) } if (pending) - handle_futex_death((void __user *)pending + futex_offset, + handle_futex_death(((void __user *)pending + futex_offset), curr, pip); } @@ -3155,8 +3155,8 @@ long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout, if (op & FUTEX_CLOCK_REALTIME) { flags |= FLAGS_CLOCKRT; - if (cmd != FUTEX_WAIT && cmd != FUTEX_WAIT_BITSET && \ - cmd != FUTEX_WAIT_REQUEUE_PI) + if ((cmd != FUTEX_WAIT) && (cmd != FUTEX_WAIT_BITSET) && \ + (cmd != FUTEX_WAIT_REQUEUE_PI)) return -ENOSYS; } @@ -3211,9 +3211,9 @@ SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val, u32 val2 = 0; int cmd = op & FUTEX_CMD_MASK; - if (utime && (cmd == FUTEX_WAIT || cmd == FUTEX_LOCK_PI || - cmd == FUTEX_WAIT_BITSET || - cmd == FUTEX_WAIT_REQUEUE_PI)) { + if (utime && ((cmd == FUTEX_WAIT) || (cmd == FUTEX_LOCK_PI) || + (cmd == FUTEX_WAIT_BITSET) || + (cmd == FUTEX_WAIT_REQUEUE_PI))) { if (unlikely(should_fail_futex(!(op & FUTEX_PRIVATE_FLAG)))) return -EFAULT; if (copy_from_user(&ts, utime, sizeof(ts)) != 0) @@ -3230,8 +3230,8 @@ SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val, * requeue parameter in 'utime' if cmd == FUTEX_*_REQUEUE_*. * number of waiters to wake in 'utime' if cmd == FUTEX_WAKE_OP. */ - if (cmd == FUTEX_REQUEUE || cmd == FUTEX_CMP_REQUEUE || - cmd == FUTEX_CMP_REQUEUE_PI || cmd == FUTEX_WAKE_OP) + if ((cmd == FUTEX_REQUEUE) || (cmd == FUTEX_CMP_REQUEUE) || + (cmd == FUTEX_CMP_REQUEUE_PI) || (cmd == FUTEX_WAKE_OP)) val2 = (u32) (unsigned long) utime; return do_futex(uaddr, op, val, tp, uaddr2, val2, val3); @@ -3270,7 +3270,7 @@ static int __init futex_init(void) futex_queues = alloc_large_system_hash("futex", sizeof(*futex_queues), futex_hashsize, 0, - futex_hashsize < 256 ? HASH_SMALL : 0, + (futex_hashsize < 256) ? HASH_SMALL : 0, &futex_shift, NULL, futex_hashsize, futex_hashsize); futex_hashsize = 1UL << futex_shift; -- 2.7.4