aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Chancellor <[email protected]>2021-09-22 07:58:22 -0700
committerPeter Zijlstra <[email protected]>2021-10-01 13:57:49 +0200
commit1415b49bcd321bca7347f43f8b269c91ec46d1dc (patch)
tree2ae2a419d734e319d2fb79c826c8e04411288459
parentf7427ba5ce9c5438ad392b6cbcc4ca8a0487d7e7 (diff)
locking/ww-mutex: Fix uninitialized use of ret in test_aa()
Clang warns: kernel/locking/test-ww_mutex.c:138:7: error: variable 'ret' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized] if (!ww_mutex_trylock(&mutex, &ctx)) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ kernel/locking/test-ww_mutex.c:172:9: note: uninitialized use occurs here return ret; ^~~ kernel/locking/test-ww_mutex.c:138:3: note: remove the 'if' if its condition is always false if (!ww_mutex_trylock(&mutex, &ctx)) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ kernel/locking/test-ww_mutex.c:125:9: note: initialize the variable 'ret' to silence this warning int ret; ^ = 0 1 error generated. Assign !ww_mutex_trylock(...) to ret so that it is always initialized. Fixes: 12235da8c80a ("kernel/locking: Add context to ww_mutex_trylock()") Reported-by: "kernelci.org bot" <[email protected]> Reported-by: Stephen Rothwell <[email protected]> Signed-off-by: Nathan Chancellor <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Acked-by: Waiman Long <[email protected]> Link: https://lore.kernel.org/r/[email protected]
-rw-r--r--kernel/locking/test-ww_mutex.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/locking/test-ww_mutex.c b/kernel/locking/test-ww_mutex.c
index d63ac411f367..353004155d65 100644
--- a/kernel/locking/test-ww_mutex.c
+++ b/kernel/locking/test-ww_mutex.c
@@ -135,7 +135,8 @@ static int test_aa(bool trylock)
goto out;
}
} else {
- if (!ww_mutex_trylock(&mutex, &ctx)) {
+ ret = !ww_mutex_trylock(&mutex, &ctx);
+ if (ret) {
pr_err("%s: initial trylock failed!\n", __func__);
goto out;
}