Merge branch 'uaccess.futex' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs into locking/core

KAGA-KOKO · KAGA-KOKO · commit cf226c42b2d6 · 2020-03-28T11:59:24.000+01:00
Pull uaccess futex cleanups for Al Viro:

     Consolidate access_ok() usage and the futex uaccess function zoo.
diff --git a/arch/alpha/include/asm/futex.h b/arch/alpha/include/asm/futex.h
@@ -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;
 
diff --git a/arch/arc/include/asm/futex.h b/arch/arc/include/asm/futex.h
@@ -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
diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
@@ -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
diff --git a/arch/arm64/include/asm/futex.h b/arch/arm64/include/asm/futex.h
@@ -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;
 
diff --git a/arch/hexagon/include/asm/futex.h b/arch/hexagon/include/asm/futex.h
@@ -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;
 
diff --git a/arch/ia64/include/asm/futex.h b/arch/ia64/include/asm/futex.h
@@ -50,7 +50,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:
@@ -74,8 +75,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
 		ret = -ENOSYS;
 	}
 
-	pagefault_enable();
-
 	if (!ret)
 		*oval = oldval;
 
diff --git a/arch/microblaze/include/asm/futex.h b/arch/microblaze/include/asm/futex.h
@@ -34,7 +34,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:
@@ -56,8 +57,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
 		ret = -ENOSYS;
 	}
 
-	pagefault_enable();
-
 	if (!ret)
 		*oval = oldval;
 
diff --git a/arch/mips/include/asm/futex.h b/arch/mips/include/asm/futex.h
@@ -89,7 +89,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:
@@ -116,8 +117,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
 		ret = -ENOSYS;
 	}
 
-	pagefault_enable();
-
 	if (!ret)
 		*oval = oldval;
 
diff --git a/arch/nds32/include/asm/futex.h b/arch/nds32/include/asm/futex.h
@@ -66,8 +66,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:
 		__futex_atomic_op("move	%0, %3", ret, oldval, tmp, uaddr,
@@ -93,8 +93,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
 		ret = -ENOSYS;
 	}
 
-	pagefault_enable();
-
 	if (!ret)
 		*oval = oldval;
 
diff --git a/arch/openrisc/include/asm/futex.h b/arch/openrisc/include/asm/futex.h
@@ -35,7 +35,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:
@@ -57,8 +58,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
 		ret = -ENOSYS;
 	}
 
-	pagefault_enable();
-
 	if (!ret)
 		*oval = oldval;
 
diff --git a/arch/parisc/include/asm/futex.h b/arch/parisc/include/asm/futex.h
@@ -40,7 +40,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
 	u32 tmp;
 
 	_futex_spin_lock_irqsave(uaddr, &flags);
-	pagefault_disable();
 
 	ret = -EFAULT;
 	if (unlikely(get_user(oldval, uaddr) != 0))
@@ -73,7 +72,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
 		ret = -EFAULT;
 
 out_pagefault_enable:
-	pagefault_enable();
 	_futex_spin_unlock_irqrestore(uaddr, &flags);
 
 	if (!ret)
diff --git a/arch/powerpc/include/asm/futex.h b/arch/powerpc/include/asm/futex.h
@@ -35,8 +35,9 @@ 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;
 	allow_read_write_user(uaddr, uaddr, sizeof(*uaddr));
-	pagefault_disable();
 
 	switch (op) {
 	case FUTEX_OP_SET:
@@ -58,8 +59,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
 		ret = -ENOSYS;
 	}
 
-	pagefault_enable();
-
 	*oval = oldval;
 
 	prevent_read_write_user(uaddr, uaddr, sizeof(*uaddr));
diff --git a/arch/riscv/include/asm/futex.h b/arch/riscv/include/asm/futex.h
@@ -46,7 +46,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
 {
 	int oldval = 0, ret = 0;
 
-	pagefault_disable();
+	if (!access_ok(uaddr, sizeof(u32)))
+		return -EFAULT;
 
 	switch (op) {
 	case FUTEX_OP_SET:
@@ -73,8 +74,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)
 		ret = -ENOSYS;
 	}
 
-	pagefault_enable();
-
 	if (!ret)
 		*oval = oldval;
 
diff --git a/arch/s390/include/asm/futex.h b/arch/s390/include/asm/futex.h
@@ -29,7 +29,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
 	mm_segment_t old_fs;
 
 	old_fs = enable_sacf_uaccess();
-	pagefault_disable();
 	switch (op) {
 	case FUTEX_OP_SET:
 		__futex_atomic_op("lr %2,%5\n",
@@ -54,7 +53,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
 	default:
 		ret = -ENOSYS;
 	}
-	pagefault_enable();
 	disable_sacf_uaccess(old_fs);
 
 	if (!ret)
diff --git a/arch/sh/include/asm/futex.h b/arch/sh/include/asm/futex.h
@@ -34,8 +34,6 @@ static inline int arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval,
 	u32 oldval, newval, prev;
 	int ret;
 
-	pagefault_disable();
-
 	do {
 		ret = get_user(oldval, uaddr);
 
@@ -67,8 +65,6 @@ static inline int arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval,
 		ret = futex_atomic_cmpxchg_inatomic(&prev, uaddr, oldval, newval);
 	} while (!ret && prev != oldval);
 
-	pagefault_enable();
-
 	if (!ret)
 		*oval = oldval;
 
diff --git a/arch/sparc/include/asm/futex_64.h b/arch/sparc/include/asm/futex_64.h
@@ -38,8 +38,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
 	if (unlikely((((unsigned long) uaddr) & 0x3UL)))
 		return -EINVAL;
 
-	pagefault_disable();
-
 	switch (op) {
 	case FUTEX_OP_SET:
 		__futex_cas_op("mov\t%4, %1", ret, oldval, uaddr, oparg);
@@ -60,8 +58,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,
 		ret = -ENOSYS;
 	}
 
-	pagefault_enable();
-
 	if (!ret)
 		*oval = oldval;
 
diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
diff --git a/arch/xtensa/include/asm/futex.h b/arch/xtensa/include/asm/futex.h
diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h
diff --git a/kernel/futex.c b/kernel/futex.c
diff --git a/tools/objtool/check.c b/tools/objtool/check.c

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,`
`31`	`31`	`{`
`32`	`32`	`int oldval = 0, ret;`
`33`	`33`
`34`		`- pagefault_disable();`
	`34`	`+ if (!access_ok(uaddr, sizeof(u32)))`
	`35`	`+ return -EFAULT;`
`35`	`36`
`36`	`37`	`switch (op) {`
`37`	`38`	`case FUTEX_OP_SET:`
`@@ -53,8 +54,6 @@ static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,`
`53`	`54`	`ret = -ENOSYS;`
`54`	`55`	`}`
`55`	`56`
`56`		`- pagefault_enable();`
`57`		`-`
`58`	`57`	`if (!ret)`
`59`	`58`	`*oval = oldval;`
`60`	`59`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int oval, u32 __user uaddr)`
`36`	`36`	`{`
`37`	`37`	`int oldval = 0, ret;`
`38`	`38`
`39`		`- pagefault_disable();`
	`39`	`+ if (!access_ok(uaddr, sizeof(u32)))`
	`40`	`+ return -EFAULT;`
`40`	`41`
`41`	`42`	`switch (op) {`
`42`	`43`	`case FUTEX_OP_SET:`
`@@ -62,8 +63,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int oval, u32 __user uaddr)`
`62`	`63`	`ret = -ENOSYS;`
`63`	`64`	`}`
`64`	`65`
`65`		`- pagefault_enable();`
`66`		`-`
`67`	`66`	`if (!ret)`
`68`	`67`	`*oval = oldval;`
`69`	`68`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int oval, u32 __user uaddr)`
`50`	`50`	`{`
`51`	`51`	`int oldval = 0, ret;`
`52`	`52`
`53`		`- pagefault_disable();`
	`53`	`+ if (!access_ok(uaddr, sizeof(u32)))`
	`54`	`+ return -EFAULT;`
`54`	`55`
`55`	`56`	`switch (op) {`
`56`	`57`	`case FUTEX_OP_SET:`
`@@ -74,8 +75,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int oval, u32 __user uaddr)`
`74`	`75`	`ret = -ENOSYS;`
`75`	`76`	`}`
`76`	`77`
`77`		`- pagefault_enable();`
`78`		`-`
`79`	`78`	`if (!ret)`
`80`	`79`	`*oval = oldval;`
`81`	`80`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int oval, u32 __user uaddr)`
`34`	`34`	`{`
`35`	`35`	`int oldval = 0, ret;`
`36`	`36`
`37`		`- pagefault_disable();`
	`37`	`+ if (!access_ok(uaddr, sizeof(u32)))`
	`38`	`+ return -EFAULT;`
`38`	`39`
`39`	`40`	`switch (op) {`
`40`	`41`	`case FUTEX_OP_SET:`
`@@ -56,8 +57,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int oval, u32 __user uaddr)`
`56`	`57`	`ret = -ENOSYS;`
`57`	`58`	`}`
`58`	`59`
`59`		`- pagefault_enable();`
`60`		`-`
`61`	`60`	`if (!ret)`
`62`	`61`	`*oval = oldval;`
`63`	`62`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int oval, u32 __user uaddr)`
`89`	`89`	`{`
`90`	`90`	`int oldval = 0, ret;`
`91`	`91`
`92`		`- pagefault_disable();`
	`92`	`+ if (!access_ok(uaddr, sizeof(u32)))`
	`93`	`+ return -EFAULT;`
`93`	`94`
`94`	`95`	`switch (op) {`
`95`	`96`	`case FUTEX_OP_SET:`
`@@ -116,8 +117,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int oval, u32 __user uaddr)`
`116`	`117`	`ret = -ENOSYS;`
`117`	`118`	`}`
`118`	`119`
`119`		`- pagefault_enable();`
`120`		`-`
`121`	`120`	`if (!ret)`
`122`	`121`	`*oval = oldval;`
`123`	`122`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@ arch_futex_atomic_op_inuser(int op, int oparg, int oval, u32 __user uaddr)`
`35`	`35`	`{`
`36`	`36`	`int oldval = 0, ret;`
`37`	`37`
`38`		`- pagefault_disable();`
	`38`	`+ if (!access_ok(uaddr, sizeof(u32)))`
	`39`	`+ return -EFAULT;`
`39`	`40`
`40`	`41`	`switch (op) {`
`41`	`42`	`case FUTEX_OP_SET:`
`@@ -57,8 +58,6 @@ arch_futex_atomic_op_inuser(int op, int oparg, int oval, u32 __user uaddr)`
`57`	`58`	`ret = -ENOSYS;`
`58`	`59`	`}`
`59`	`60`
`60`		`- pagefault_enable();`
`61`		`-`
`62`	`61`	`if (!ret)`
`63`	`62`	`*oval = oldval;`
`64`	`63`