hw/nvme: fix unintentional integer overflow in shift
PATCH 1/1 hw/nvme: fix unintentional integer overflow in shift
From: Klaus Jensen <[email protected]>
Fix potentially overflowing shift operation.
Resolves: Coverity CID 1663674
--- hw/nvme/ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/nvme/ctrl.c +1 -1
@@ -6622,7 +6622,7 @@ static uint16_t nvme_set_feature_fdp_events(NvmeCtrl *n, NvmeNamespace *ns,if (!shift && event_type) {continue ; } - event_mask |= (1 << nvme_fdp_evf_shifts[events[i]]); + event_mask |= (1ULL << nvme_fdp_evf_shifts[events[i]]); }if (enable) {
---
base-commit: 299e7557ed15a9a325620698add379a3ce2d1d95
change-id: 20260728-fix-shift-525e53c1df6f
Best regards,
Signature · 1 line
Klaus Jensen <[email protected]>
Quoted 18 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Fix potentially overflowing shift operation.
Suggested-by Peter Maydell <[email protected]>Resolves: Coverity CID 1663674
Fixes ec917cd49918 ("hw/nvme: fix FDP set FDP events")Signed-off-by Klaus Jensen <[email protected]>--- hw/nvme/ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/nvme/ctrl.c +0
-0
hw/nvme/ctrl.c static uint16_t nvme_set_feature_fdp_events(NvmeCtrl *n, NvmeNamespace *ns, · line 6625
Quoted 5 lines
hw/nvme/ctrl.c +1
-1@@ -6622,7 +6622,7 @@ static uint16_t nvme_set_feature_fdp_events(NvmeCtrl *n, NvmeNamespace *ns,if (!shift && event_type) {continue ; } - event_mask |= (1 << nvme_fdp_evf_shifts[events[i]]); + event_mask |= (1ULL << nvme_fdp_evf_shifts[events[i]]);
Alternatively:
event_mask = deposit64(event_mask, nvme_fdp_evf_shifts[events[i]], 1);
Quoted 9 lines
hw/nvme/ctrl.c +0
-1}if (enable) { ---base-commit:
299e7557ed15a9a325620698add379a3ce2d1d95
change-id: 20260728-fix-shift-525e53c1df6fBest regards,
Quoted 27 lines · Philippe Mathieu-Daudé
Quoted 18 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Fix potentially overflowing shift operation.
Suggested-by Peter Maydell <[email protected]>Resolves: Coverity CID 1663674
Fixes ec917cd49918 ("hw/nvme: fix FDP set FDP events")Signed-off-by Klaus Jensen <[email protected]>--- hw/nvme/ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/nvme/ctrl.c +0
-0hw/nvme/ctrl.c static uint16_t nvme_set_feature_fdp_events(NvmeCtrl *n, NvmeNamespace *ns, · line 6625
Quoted 5 lines
hw/nvme/ctrl.c +1
-1@@ -6622,7 +6622,7 @@ static uint16_t nvme_set_feature_fdp_events(NvmeCtrl *n, NvmeNamespace *ns,if (!shift && event_type) {continue ; } - event_mask |= (1 << nvme_fdp_evf_shifts[events[i]]); + event_mask |= (1ULL << nvme_fdp_evf_shifts[events[i]]);Alternatively:
Quoted 2 lines
event_mask = deposit64(event_mask, nvme_fdp_evf_shifts[events[i]], 1);
Better! Thanks!
Quoted 10 lines
Quoted 8 lines
hw/nvme/ctrl.c +0
-1}if (enable) { ---base-commit:
299e7557ed15a9a325620698add379a3ce2d1d95
change-id: 20260728-fix-shift-525e53c1df6fBest regards,
Philippe Mathieu-Daudé
Reviewed-byQuoted 28 lines · Klaus Jensen
Quoted 27 lines · Philippe Mathieu-Daudé
Quoted 18 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Fix potentially overflowing shift operation.
Suggested-by Peter Maydell <[email protected]>Resolves: Coverity CID 1663674
Fixes ec917cd49918 ("hw/nvme: fix FDP set FDP events")Signed-off-by Klaus Jensen <[email protected]>--- hw/nvme/ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/nvme/ctrl.c +0
-0hw/nvme/ctrl.c static uint16_t nvme_set_feature_fdp_events(NvmeCtrl *n, NvmeNamespace *ns, · line 6625
Quoted 5 lines
hw/nvme/ctrl.c +1
-1@@ -6622,7 +6622,7 @@ static uint16_t nvme_set_feature_fdp_events(NvmeCtrl *n, NvmeNamespace *ns,if (!shift && event_type) {continue ; } - event_mask |= (1 << nvme_fdp_evf_shifts[events[i]]); + event_mask |= (1ULL << nvme_fdp_evf_shifts[events[i]]);Alternatively:
Quoted 4 lines
Quoted 2 lines
event_mask = deposit64(event_mask, nvme_fdp_evf_shifts[events[i]], 1);Better! Thanks!
Quoted 11 lines
Quoted 11 lines
Quoted 9 lines
hw/nvme/ctrl.c +0
-1}if (enable) { ---base-commit:
299e7557ed15a9a325620698add379a3ce2d1d95
change-id: 20260728-fix-shift-525e53c1df6fBest regards,