From: Masami Hiramatsu <mhiramat@kernel.org>
To: jbacik@fb.com, ast@kernel.org
Cc: bpf@vger.kernel.org, mhiramat@kernel.org,
linux-kernel@vger.kernel.org, luomeng12@huawei.com
Subject: [PATCH] fail_function: remove a redundant mutex unlock
Date: Wed, 18 Nov 2020 22:49:31 +0900 [thread overview]
Message-ID: <160570737118.263807.8358435412898356284.stgit@devnote2> (raw)
In-Reply-To: <20201110084245.3067324-1-luomeng12@huawei.com>
From: Luo Meng <luomeng12@huawei.com>
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>
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Luo Meng <luomeng12@huawei.com>
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
0 files changed
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;
}
next parent reply other threads:[~2020-11-18 13:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20201110084245.3067324-1-luomeng12@huawei.com>
2020-11-18 13:49 ` Masami Hiramatsu [this message]
2020-11-19 19:10 ` [PATCH] fail_function: remove a redundant mutex unlock patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=160570737118.263807.8358435412898356284.stgit@devnote2 \
--to=mhiramat@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=jbacik@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luomeng12@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox