Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17f1dca2 authored by Jaesoo Lee's avatar Jaesoo Lee Committed by Greg Kroah-Hartman
Browse files

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



[ Upstream commit c8e8c77b3bdbade6e26e8e76595f141ede12b692 ]

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: default avatarJaesoo Lee <jalee@purestorage.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 71d019a6

drivers/nvme/host/core.c

+2 −1
Original line number Diff line number Diff line
@@ -3228,7 +3228,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);