|
@@ -48,16 +48,16 @@ do { \
|
|
|
} while (0)
|
|
|
|
|
|
static inline int
|
|
|
-futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
|
|
|
+futex_atomic_op_inuser(unsigned int encoded_op, u32 __user *uaddr)
|
|
|
{
|
|
|
int op = (encoded_op >> 28) & 7;
|
|
|
int cmp = (encoded_op >> 24) & 15;
|
|
|
- int oparg = (encoded_op << 8) >> 20;
|
|
|
- int cmparg = (encoded_op << 20) >> 20;
|
|
|
+ int oparg = (int)(encoded_op << 8) >> 20;
|
|
|
+ int cmparg = (int)(encoded_op << 20) >> 20;
|
|
|
int oldval = 0, ret, tmp;
|
|
|
|
|
|
if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))
|
|
|
- oparg = 1 << oparg;
|
|
|
+ oparg = 1U << (oparg & 0x1f);
|
|
|
|
|
|
if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
|
|
|
return -EFAULT;
|