From: Minchan Kim <minchan@kernel.org>
To: Peter Kalauskas <peskal@google.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [PATCH] zram: fix bug storing backing_dev
Date: Mon, 13 Aug 2018 15:16:23 +0900 [thread overview]
Message-ID: <20180813061623.GC64836@rodete-desktop-imager.corp.google.com> (raw)
In-Reply-To: <20180808223100.225086-1-peskal@google.com>
On Wed, Aug 08, 2018 at 03:31:00PM -0700, Peter Kalauskas wrote:
> The call to strlcpy in backing_dev_store is incorrect. It should take
> the size of the destination buffer instead of the size of the source
> buffer. Additionally, ignore the newline character (\n) when reading
> the new file_name buffer. This makes it possible to set the backing_dev
> as follows:
>
> echo /dev/sdX > /sys/block/zram0/backing_dev
>
> Signed-off-by: Peter Kalauskas <peskal@google.com>
Acked-by: Minchan Kim <minchan@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
CC: LKML <linux-kernel@vger.kernel.org>
Cc: <stable@vger.kernel.org> [4.14+]
> ---
> drivers/block/zram/zram_drv.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
> index 7436b2d27fa3..3137faea1493 100644
> --- a/drivers/block/zram/zram_drv.c
> +++ b/drivers/block/zram/zram_drv.c
> @@ -336,6 +336,7 @@ static ssize_t backing_dev_store(struct device *dev,
> struct device_attribute *attr, const char *buf, size_t len)
> {
> char *file_name;
> + size_t sz;
> struct file *backing_dev = NULL;
> struct inode *inode;
> struct address_space *mapping;
> @@ -356,7 +357,11 @@ static ssize_t backing_dev_store(struct device *dev,
> goto out;
> }
>
> - strlcpy(file_name, buf, len);
> + strlcpy(file_name, buf, PATH_MAX);
> + /* ignore trailing newline */
> + sz = strlen(file_name);
> + if (sz > 0 && file_name[sz - 1] == '\n')
> + file_name[sz - 1] = 0x00;
>
> backing_dev = filp_open(file_name, O_RDWR|O_LARGEFILE, 0);
> if (IS_ERR(backing_dev)) {
> --
> 2.18.0.597.ga71716f1ad-goog
>
next parent reply other threads:[~2018-08-13 6:16 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20180808223100.225086-1-peskal@google.com>
2018-08-13 6:16 ` Minchan Kim [this message]
2018-08-13 7:38 ` Sergey Senozhatsky
2018-08-14 23:45 ` Andrew Morton
2018-08-16 1:48 ` Sergey Senozhatsky
2018-08-16 1:57 ` Sergey Senozhatsky
2018-08-16 3:32 ` Andrew Morton
[not found] ` <20180821160307.GA63897@google.com>
2018-08-22 1:28 ` Peter Kalauskas
[not found] ` <20180822004504.GB2218@jagdpanzerIV>
2018-08-22 1:29 ` Peter Kalauskas
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=20180813061623.GC64836@rodete-desktop-imager.corp.google.com \
--to=minchan@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peskal@google.com \
--cc=sergey.senozhatsky.work@gmail.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
all inboxes | Powered by JetHome®