[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/11] hw/nvme: fix narrowing conversion
From: |
Klaus Jensen |
Subject: |
[PULL 01/11] hw/nvme: fix narrowing conversion |
Date: |
Fri, 3 Jun 2022 21:53:44 +0200 |
From: Dmitry Tikhov <ddtikhov@gmail.com>
Since nlbas is of type int, it does not work with large namespace size
values, e.g., 9 TB size of file backing namespace and 8 byte metadata
with 4096 bytes lbasz gives negative nlbas value, which is later
promoted to negative int64_t type value and results in negative
ns->moff which breaks namespace
Signed-off-by: Dmitry Tikhov <ddtikhov@gmail.com>
Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
---
hw/nvme/ns.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/nvme/ns.c b/hw/nvme/ns.c
index 324f53ea0cd1..af6504fad2d8 100644
--- a/hw/nvme/ns.c
+++ b/hw/nvme/ns.c
@@ -29,7 +29,8 @@ void nvme_ns_init_format(NvmeNamespace *ns)
{
NvmeIdNs *id_ns = &ns->id_ns;
BlockDriverInfo bdi;
- int npdg, nlbas, ret;
+ int npdg, ret;
+ int64_t nlbas;
ns->lbaf = id_ns->lbaf[NVME_ID_NS_FLBAS_INDEX(id_ns->flbas)];
ns->lbasz = 1 << ns->lbaf.ds;
@@ -42,7 +43,7 @@ void nvme_ns_init_format(NvmeNamespace *ns)
id_ns->ncap = id_ns->nsze;
id_ns->nuse = id_ns->ncap;
- ns->moff = (int64_t)nlbas << ns->lbaf.ds;
+ ns->moff = nlbas << ns->lbaf.ds;
npdg = ns->blkconf.discard_granularity / ns->lbasz;
--
2.36.1
- [PULL 00/11] hw/nvme updates, Klaus Jensen, 2022/06/03
- [PULL 01/11] hw/nvme: fix narrowing conversion,
Klaus Jensen <=
- [PULL 02/11] hw/nvme: add missing return statement, Klaus Jensen, 2022/06/03
- [PULL 03/11] hw/nvme: fix copy cmd for pi enabled namespaces, Klaus Jensen, 2022/06/03
- [PULL 04/11] hw/nvme: fix smart aen, Klaus Jensen, 2022/06/03
- [PULL 05/11] hw/nvme: enforce common serial per subsystem, Klaus Jensen, 2022/06/03
- [PULL 06/11] hw/nvme: do not auto-generate eui64, Klaus Jensen, 2022/06/03
- [PULL 07/11] hw/nvme: do not auto-generate uuid, Klaus Jensen, 2022/06/03
- [PULL 08/11] hw/nvme: do not report null uuid, Klaus Jensen, 2022/06/03
- [PULL 09/11] hw/nvme: bump firmware revision, Klaus Jensen, 2022/06/03
- [PULL 10/11] hw/nvme: deprecate the use-intel-id compatibility parameter, Klaus Jensen, 2022/06/03
- [PULL 11/11] hw/nvme: add new command abort case, Klaus Jensen, 2022/06/03