From: Erwan Velu <erwanaliasr1@gmail.com>
Cc: Erwan Velu <e.velu@criteo.com>, Keith Busch <kbusch@kernel.org>,
Jens Axboe <axboe@fb.com>, Christoph Hellwig <hch@lst.de>,
Sagi Grimberg <sagi@grimberg.me>,
linux-nvme@lists.infradead.org (open list:NVM EXPRESS DRIVER),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 1/2] nvme: Ensure char members of struct nvme_id_ctrl are null-terminated
Date: Tue, 14 Jun 2022 23:09:01 +0200 [thread overview]
Message-ID: <20220614210902.744318-1-e.velu@criteo.com> (raw)
When issueing an identify command, the resulting data structure stored
as a nvme_id_ctrl struct, contains a couple of char members.
These char members features:
- the serial number (sn)
- the model number (mn)
- the firmware revision (fr)
As per the current code, nothing enforce these members to be
null-terminated which causes issues when manipulating them with regular
string manupulation functions.
This commit ensure the three of them are always null-terminated.
Signed-off-by: Erwan Velu <e.velu@criteo.com>
---
drivers/nvme/host/core.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 24165daee3c8..0f7e625e8bd0 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1274,6 +1274,13 @@ static int nvme_identify_ctrl(struct nvme_ctrl *dev, struct nvme_id_ctrl **id)
sizeof(struct nvme_id_ctrl));
if (error)
kfree(*id);
+ else {
+ /* Ensure that model, serial and firmware fields are always null-terminated */
+ (*id)->mn[sizeof((*id)->mn)-1] = 0;
+ (*id)->sn[sizeof((*id)->sn)-1] = 0;
+ (*id)->fr[sizeof((*id)->fr)-1] = 0;
+ }
+
return error;
}
--
2.35.3
next reply other threads:[~2022-06-14 21:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-14 21:09 Erwan Velu [this message]
2022-06-14 21:09 ` [PATCH 2/2] nvme: Report model,sn,fw,pci device information during init Erwan Velu
2022-06-14 21:30 ` Keith Busch
2022-06-15 5:37 ` Christoph Hellwig
[not found] ` <CAL2JzuwnZhMgaVQ0=LAYfe6pWnxGLgR_b4xdF_==F3vL_Hh=gw@mail.gmail.com>
2022-06-15 10:53 ` Christoph Hellwig
2022-06-15 11:04 ` Jens Axboe
2022-06-14 21:24 ` [PATCH 1/2] nvme: Ensure char members of struct nvme_id_ctrl are null-terminated Keith Busch
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=20220614210902.744318-1-e.velu@criteo.com \
--to=erwanaliasr1@gmail.com \
--cc=axboe@fb.com \
--cc=e.velu@criteo.com \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--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