arch-powerpc: Return false instead of -EFAULT
PATCH 1/1 arch-powerpc: Return false instead of -EFAULT
Returning a negative value for a boolean function seem to have the undesired effect of returning true. Replace -EINVAL by false in a bool-returning function.
The diff of the .s file before and after the change (using cross compilation) starts with:
440,441c440,441
< .L43:
< li 3,1 # D.25775,
---
Quoted 2 lines
.L42:
li 3,0 # D.25775,
...
while if -EFAULT is replaced by true, the diff is empty.
There is only one call site, and it expects a boolean value:arch/powerpc/kernel/ftrace.c:129:
if (!is_module_trampoline(tramp)) {
pr_err("Not a trampoline\n");
return -EINVAL;
}This issue was found by the following Coccinelle semantic patch:
<smpl>
@@
identifier f;
constant C;
typedef bool;
@@
bool f (...){
<+...
* return -C;
...+>
}
</smpl>
--- arch/powerpc/kernel/module_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/module_64.c +1 -1
@@ -160,7 +160,7 @@ bool is_module_trampoline(u32 *p)BUILD_BUG_ON (sizeof (ppc64_stub_insns) !=sizeof (ppc64_stub_mask));if (probe_kernel_read (insns, p,sizeof (insns))) -return -EFAULT ; +return false;for (i =0 ; i <ARRAY_SIZE (ppc64_stub_insns); i++) {u32 insna = insns[i];
Signature · 1 line
2.1.0
Michael Ellerman
reviewerQuoted 11 lines · Peter Senna Tschudin
Returning a negative value for a boolean function seem to have the undesired effect of returning true. Replace
-EINVALby false in a bool-returning function.The diff of the .s file before and after the change (using cross compilation) starts with:
440,441c440,441
< .L43:
< li 3,1 # D.25775,
---
Quoted 5 lines
Quoted 2 lines
.L42:
li 3,0 # D.25775,...
while if
-EFAULTis replaced by true, the diff is empty.
Ah, that's rather unfortunate.
Can you post the full asm listing, for all three cases?
cheers
Quoted 14 lines · Michael Ellerman
Quoted 13 lines · Peter Senna Tschudin
Returning a negative value for a boolean function seem to have the undesired effect of returning true. Replace
-EINVALby false in a bool-returning function.The diff of the .s file before and after the change (using cross compilation) starts with:
440,441c440,441
< .L43:
< li 3,1 # D.25775,
---Quoted 2 lines
.L42:
li 3,0 # D.25775,
Quoted 7 lines
Quoted 3 lines
...
while if
-EFAULTis replaced by true, the diff is empty.Ah, that's rather unfortunate.
Can you post the full asm listing, for all three cases?
Sure, but it would be 3 files of 70kb each. You can download them form:
http://petersenna.com/files/module_64.s.tar.xz
Let me know if this download method doesn't work for you.
module_64.s: Original file.
module_64-patched.s: With my patch
module_64-true.s: Changing -EFAULT by true
files were made with:
$ make arch/powerpc/kernel/module_64.s
using:
gcc-powerpc64-linux-gnu-4.9.2-5.fc21.x86_64
Quoted 4 lines
cheers
Signature · 1 line
Peter