aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuo Meng <luomeng12@huawei.com>2020-11-18 22:49:31 +0900
committerAlexei Starovoitov <ast@kernel.org>2020-11-19 11:58:16 -0800
commit2801a5da5b25b7af9dd2addd19b2315c02d17b64 (patch)
treedbabe546198f7e2d4386a36345730541e747ab58
parent14d6d86c210aea1a83c19a8f6391ecabcbefed94 (diff)
downloadlinux-stericsson-2801a5da5b25b7af9dd2addd19b2315c02d17b64.tar.gz
fail_function: Remove a redundant mutex unlock
Fix a mutex_unlock() issue where before copy_from_user() is not called mutex_locked. Fixes: 4b1a29a7f542 ("error-injection: Support fault injection framework") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Luo Meng <luomeng12@huawei.com> Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> Signed-off-by: Alexei Starovoitov <ast@kernel.org> Acked-by: Masami Hiramatsu <mhiramat@kernel.org> Link: https://lore.kernel.org/bpf/160570737118.263807.8358435412898356284.stgit@devnote2
-rw-r--r--kernel/fail_function.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/fail_function.c b/kernel/fail_function.c
index 63b349168da7..b0b1ad93fa95 100644
--- a/kernel/fail_function.c
+++ b/kernel/fail_function.c
@@ -253,7 +253,7 @@ static ssize_t fei_write(struct file *file, const char __user *buffer,
if (copy_from_user(buf, buffer, count)) {
ret = -EFAULT;
- goto out;
+ goto out_free;
}
buf[count] = '\0';
sym = strstrip(buf);
@@ -307,8 +307,9 @@ static ssize_t fei_write(struct file *file, const char __user *buffer,
ret = count;
}
out:
- kfree(buf);
mutex_unlock(&fei_lock);
+out_free:
+ kfree(buf);
return ret;
}