From: "Arnd Bergmann" <arnd@arndb.de>
To: "Keith Busch" <kbusch@kernel.org>, "Arnd Bergmann" <arnd@kernel.org>
Cc: "Christoph Hellwig" <hch@lst.de>,
"Sagi Grimberg" <sagi@grimberg.me>,
"Chaitanya Kulkarni" <kch@nvidia.com>,
linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org,
"Daniel Wagner" <dwagner@suse.de>,
"Hannes Reinecke" <hare@suse.de>
Subject: Re: [PATCH 1/2] nvmet: re-fix tracing strncpy() warning
Date: Fri, 05 Jan 2024 21:36:38 +0100 [thread overview]
Message-ID: <20508695-b9e6-4aaa-9c78-84891c1a8f9a@app.fastmail.com> (raw)
In-Reply-To: <ZZhli2FWXwP1XSRG@kbusch-mbp>
On Fri, Jan 5, 2024, at 21:24, Keith Busch wrote:
> On Wed, Jan 03, 2024 at 04:56:55PM +0100, Arnd Bergmann wrote:
>> @@ -53,8 +53,7 @@ static inline void __assign_req_name(char *name, struct nvmet_req *req)
>> return;
>> }
>>
>> - strncpy(name, req->ns->device_path,
>> - min_t(size_t, DISK_NAME_LEN, strlen(req->ns->device_path)));
>> + strscpy_pad(name, req->ns->device_path, DISK_NAME_LEN);
>> }
>
> I like this one, however Daniel has a different fix for this already
> staged in nvme-6.8:
>
>
> https://git.infradead.org/nvme.git/commitdiff/8f6c0eec5fad13785fd53a5b3b5f8b97b722a2a3
+ snprintf(name,
+ min_t(size_t, DISK_NAME_LEN, strlen(req->ns->device_path) + 1),
+ "%s", req->ns->device_path);
Don't we still need the zero-padding here to avoid leaking
kernel data to userspace?
Arnd
next prev parent reply other threads:[~2024-01-05 20:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-03 15:56 Arnd Bergmann
2024-01-03 15:56 ` [PATCH 2/2] nvme: trace: avoid memcpy overflow warning Arnd Bergmann
2024-01-05 4:31 ` Christoph Hellwig
2024-01-05 20:25 ` Keith Busch
2024-01-05 20:24 ` [PATCH 1/2] nvmet: re-fix tracing strncpy() warning Keith Busch
2024-01-05 20:36 ` Arnd Bergmann [this message]
2024-01-05 20:57 ` Keith Busch
2024-01-05 21:40 ` Arnd Bergmann
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=20508695-b9e6-4aaa-9c78-84891c1a8f9a@app.fastmail.com \
--to=arnd@arndb.de \
--cc=arnd@kernel.org \
--cc=dwagner@suse.de \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=kch@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/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®