diff options
| author | Namhyung Kim | 2016-10-19 03:23:41 +0200 |
|---|---|---|
| committer | Kees Cook | 2016-11-16 01:34:32 +0100 |
| commit | 70ad35db3321a6d129245979de4ac9d06eed897c (patch) | |
| tree | 935660eba5136072d0f8c014fd2ce70aefaa7889 /fs | |
| parent | pstore: Protect unlink with read_mutex (diff) | |
| download | kernel-qcow2-linux-70ad35db3321a6d129245979de4ac9d06eed897c.tar.gz kernel-qcow2-linux-70ad35db3321a6d129245979de4ac9d06eed897c.tar.xz kernel-qcow2-linux-70ad35db3321a6d129245979de4ac9d06eed897c.zip | |
pstore: Convert console write to use ->write_buf
Maybe I'm missing something, but I don't know why it needs to copy the
input buffer to psinfo->buf and then write. Instead we can write the
input buffer directly. The only implementation that supports console
message (i.e. ramoops) already does it for ftrace messages.
For the upcoming virtio backend driver, it needs to protect psinfo->buf
overwritten from console messages. If it could use ->write_buf method
instead of ->write, the problem will be solved easily.
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/pstore/platform.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index 60e6db6f5da2..729677e18e36 100644 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c @@ -585,8 +585,8 @@ static void pstore_console_write(struct console *con, const char *s, unsigned c) } else { spin_lock_irqsave(&psinfo->buf_lock, flags); } - memcpy(psinfo->buf, s, c); - psinfo->write(PSTORE_TYPE_CONSOLE, 0, &id, 0, 0, 0, c, psinfo); + psinfo->write_buf(PSTORE_TYPE_CONSOLE, 0, &id, 0, + s, 0, c, psinfo); spin_unlock_irqrestore(&psinfo->buf_lock, flags); s += c; c = e - s; |