Skip to contentSkip to conversation

nvme: Fix u32 overflow in the number of namespace list calculation

PATCH Superseded Jaesoo Lee 3 participants 4 messages Jun 3, 2019 – Jun 4, 2019 1 message not in the archive NVMe

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Jaesoo Lee

author
#1 lore raw

PATCH v2 1/1 nvme: Fix u32 overflow in the number of namespace list calculation

The Number of Namespaces (nn) field in the identify controller data structure is defined as u32 and the maximum allowed value in NVMe specification is 0xFFFFFFFEUL. This change fixes the possible overflow of the DIV_ROUND_UP() operation used in nvme_scan_ns_list() by casting the nn to u64.

Signed-off-by Jaesoo Lee <jalee at purestorage.com>

---
Changes in v2:
- use DIV_ROUND_UP_ULL for 32-bit system

 drivers/nvme/host/core.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/nvme/host/core.c +0 -0
index 2c43e12..4c4633b 100644
@@ -3373,7 +3373,8 @@ static int nvme_scan_ns_list(struct nvme_ctrl

*ctrl, unsigned nn)

 {
        struct nvme_ns *ns;
        __le32 *ns_list;
-       unsigned i, j, nsid, prev = 0, num_lists = DIV_ROUND_UP(nn, 1024);
+       unsigned i, j, nsid, prev = 0;
+       unsigned num_lists = DIV_ROUND_UP_ULL((u64)nn, 1024);
        int ret = 0;

        ns_list = kzalloc(NVME_IDENTIFY_DATA_SIZE, GFP_KERNEL);

--
2.7.4

#2 lore raw

PATCH v2 1/1 nvme: Fix u32 overflow in the number of namespace list calculation

Quoted 6 lines · Jaesoo Lee

The Number of Namespaces (nn) field in the identify controller data structure is defined as u32 and the maximum allowed value in NVMe specification is 0xFFFFFFFEUL. This change fixes the possible overflow of the DIV_ROUND_UP() operation used in nvme_scan_ns_list() by casting the nn to u64.

Signed-off-by Jaesoo Lee <jalee at purestorage.com>

Looks good,

Reviewed-by Christoph Hellwig <hch at lst.de>