diff mbox series

[PATCH-for-5.2,v2,24/25] block/nvme: Fix nvme_submit_command() on big-endian host

Message ID 20201029093306.1063879-25-philmd@redhat.com
State Accepted
Commit a0546a7b6f14a919b67cea1d1fc4362ac2901868
Headers show
Series block/nvme: Fix Aarch64 or big-endian hosts | expand

Commit Message

Philippe Mathieu-Daudé Oct. 29, 2020, 9:33 a.m. UTC 
The Completion Queue Command Identifier is a 16-bit value,
so nvme_submit_command() is unlikely to work on big-endian
hosts, as the relevant bits are truncated.
Fix by using the correct byte-swap function.

Fixes: bdd6a90a9e5 ("block: Add VFIO based NVMe driver")
Reported-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 block/nvme.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Stefan Hajnoczi Oct. 30, 2020, 1:57 p.m. UTC | #1 
On Thu, Oct 29, 2020 at 10:33:05AM +0100, Philippe Mathieu-Daudé wrote:
> The Completion Queue Command Identifier is a 16-bit value,

> so nvme_submit_command() is unlikely to work on big-endian

> hosts, as the relevant bits are truncated.

> Fix by using the correct byte-swap function.

> 

> Fixes: bdd6a90a9e5 ("block: Add VFIO based NVMe driver")

> Reported-by: Keith Busch <kbusch@kernel.org>

> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---

>  block/nvme.c | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)


Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
diff mbox series

Patch

diff --git a/block/nvme.c b/block/nvme.c
index c8ef69cbb28..a06a188d530 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -469,7 +469,7 @@  static void nvme_submit_command(NVMeQueuePair *q, NVMeRequest *req,
     assert(!req->cb);
     req->cb = cb;
     req->opaque = opaque;
-    cmd->cid = cpu_to_le32(req->cid);
+    cmd->cid = cpu_to_le16(req->cid);
 
     trace_nvme_submit_command(q->s, q->index, req->cid);
     nvme_trace_command(cmd);