Commit a08971e9 authored by Al Viro's avatar Al Viro
Browse files

futex: arch_futex_atomic_op_inuser() calling conventions change 



Move access_ok() in and pagefault_enable()/pagefault_disable() out.
Mechanical conversion only - some instances don't really need
a separate access_ok() at all (e.g. the ones only using
get_user()/put_user(), or architectures where access_ok()
is always true); we'll deal with that in followups.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent bb6d3fb3

arch/alpha/include/asm/futex.h

+2 −3
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval, 
{

	int oldval = 0, ret;



	pagefault_disable();

	if (!access_ok(uaddr, sizeof(u32)))

		return -EFAULT;



	switch (op) {

	case FUTEX_OP_SET:
@@ -53,8 +54,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval, 
		ret = -ENOSYS;

	}



	pagefault_enable();



	if (!ret)

		*oval = oldval;

arch/arc/include/asm/futex.h

+3 −2
Original line number Diff line number Diff line
@@ -75,10 +75,12 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval, 
{

	int oldval = 0, ret;



	if (!access_ok(uaddr, sizeof(u32)))

		return -EFAULT;



#ifndef CONFIG_ARC_HAS_LLSC

	preempt_disable();	/* to guarantee atomic r-m-w of futex op */

#endif

	pagefault_disable();



	switch (op) {

	case FUTEX_OP_SET:
@@ -101,7 +103,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval, 
		ret = -ENOSYS;

	}



	pagefault_enable();

#ifndef CONFIG_ARC_HAS_LLSC

	preempt_enable();

#endif

arch/arm/include/asm/futex.h

+3 −2
Original line number Diff line number Diff line
@@ -134,10 +134,12 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) 
{

	int oldval = 0, ret, tmp;



	if (!access_ok(uaddr, sizeof(u32)))

		return -EFAULT;



#ifndef CONFIG_SMP

	preempt_disable();

#endif

	pagefault_disable();



	switch (op) {

	case FUTEX_OP_SET:
@@ -159,7 +161,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) 
		ret = -ENOSYS;

	}



	pagefault_enable();

#ifndef CONFIG_SMP

	preempt_enable();

#endif

arch/arm64/include/asm/futex.h

+2 −3
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *_uaddr) 
	int oldval = 0, ret, tmp;

	u32 __user *uaddr = __uaccess_mask_ptr(_uaddr);



	pagefault_disable();

	if (!access_ok(_uaddr, sizeof(u32)))

		return -EFAULT;



	switch (op) {

	case FUTEX_OP_SET:
@@ -75,8 +76,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *_uaddr) 
		ret = -ENOSYS;

	}



	pagefault_enable();



	if (!ret)

		*oval = oldval;

arch/hexagon/include/asm/futex.h

+2 −3
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) 
{

	int oldval = 0, ret;



	pagefault_disable();

	if (!access_ok(uaddr, sizeof(u32)))

		return -EFAULT;



	switch (op) {

	case FUTEX_OP_SET:
@@ -62,8 +63,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) 
		ret = -ENOSYS;

	}



	pagefault_enable();



	if (!ret)

		*oval = oldval;

CRA Git | Maintained and supported by SUSTech CRA and CCSE