Commit 8609c63f authored by Bart Van Assche's avatar Bart Van Assche Committed by Christoph Hellwig
Browse files

nvme: fix handling of large MDTS values 



Instead of triggering an integer overflow and undefined behavior if MDTS is
large, set max_hw_sectors to UINT_MAX.

Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
[hch: rebased to account for the new nvme_mps_to_sectors helper]
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 5befc7c2

drivers/nvme/host/core.c

+4 −2
Original line number Diff line number Diff line
@@ -3049,9 +3049,11 @@ static int nvme_get_effects_log(struct nvme_ctrl *ctrl, u8 csi, 


static inline u32 nvme_mps_to_sectors(struct nvme_ctrl *ctrl, u32 units)

{

	u32 page_shift = NVME_CAP_MPSMIN(ctrl->cap) + 12;

	u32 page_shift = NVME_CAP_MPSMIN(ctrl->cap) + 12, val;



	return 1 << (units + page_shift - 9);

	if (check_shl_overflow(1U, units + page_shift - 9, &val))

		return UINT_MAX;

	return val;

}



static int nvme_init_non_mdts_limits(struct nvme_ctrl *ctrl)