Browse Source

arm64: futex: Avoid copying out uninitialised stack in failed cmpxchg()

commit 8e4e0ac02b449297b86498ac24db5786ddd9f647 upstream.

Returning an error code from futex_atomic_cmpxchg_inatomic() indicates
that the caller should not make any use of *uval, and should instead act
upon on the value of the error code. Although this is implemented
correctly in our futex code, we needlessly copy uninitialised stack to
*uval in the error case, which can easily be avoided.

Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Will Deacon 6 years ago
parent
commit
436869e0cd
1 changed files with 3 additions and 1 deletions
  1. 3 1
      arch/arm64/include/asm/futex.h

+ 3 - 1
arch/arm64/include/asm/futex.h

@@ -134,7 +134,9 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *_uaddr,
 	: "memory");
 	: "memory");
 	uaccess_disable();
 	uaccess_disable();
 
 
-	*uval = val;
+	if (!ret)
+		*uval = val;
+
 	return ret;
 	return ret;
 }
 }