Skip to contentSkip to conversation

hw/nvme: fix unintentional integer overflow in shift

PATCH In review Klaus Jensen 2 participants 3 messages Jul 28

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 hw/nvme: fix unintentional integer overflow in shift

From: Klaus Jensen <[email protected]>

Fix potentially overflowing shift operation.

Resolves: Coverity CID 1663674

Fixes ec917cd49918 ("hw/nvme: fix FDP set FDP events")

---
Changes in v2:
- use deposit64
- Link to v1: https://lore.kernel.org/qemu-devel/[email protected]

---
 hw/nvme/ctrl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
hw/nvme/ctrl.c +2 -1
index a67e1598891c..4f1fe2ed493d 100644
@@ -6622,7 +6622,8 @@ 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 =
+            deposit64(event_mask, nvme_fdp_evf_shifts[events[i]], 1, 1);
     }
 
     if (enable) {

---
base-commit: 299e7557ed15a9a325620698add379a3ce2d1d95
change-id: 20260728-fix-shift-525e53c1df6f

Best regards,

Signature · 1 line
Klaus Jensen <[email protected]>
Reviewed-by on v2 1/1
#1 lore raw
Quoted 10 lines · Klaus Jensen

From: Klaus Jensen <[email protected]>

Fix potentially overflowing shift operation.

Resolves: Coverity CID 1663674

Fixes ec917cd49918 ("hw/nvme: fix FDP set FDP events")
Quoted 7 lines

---
Changes in v2:
- use deposit64
- Link to v1: https://lore.kernel.org/qemu-devel/[email protected]

---
  hw/nvme/ctrl.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)

Please include "qemu/bitops.h" when applying (it is indirectly included but we rather explicit includes otherwise refactoring unrelated headers might break here), otherwise:

#2 lore raw
Quoted 19 lines · Philippe Mathieu-Daudé
Quoted 10 lines · Klaus Jensen

From: Klaus Jensen <[email protected]>

Fix potentially overflowing shift operation.

Resolves: Coverity CID 1663674

Fixes ec917cd49918 ("hw/nvme: fix FDP set FDP events")
Quoted 7 lines

---
Changes in v2:
- use deposit64
- Link to v1: https://lore.kernel.org/qemu-devel/[email protected]

---
  hw/nvme/ctrl.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
Quoted 4 lines

Please include "qemu/bitops.h" when applying (it is indirectly included but we rather explicit includes otherwise refactoring unrelated headers might break here), otherwise:

Gotcha.

Quoted 2 lines