diff options
| author | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2013-04-16 15:21:06 -0400 |
|---|---|---|
| committer | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2013-04-16 15:21:06 -0400 |
| commit | 1c9b52651dad0ff1fa71fc6205c86d972f25bcc0 (patch) | |
| tree | 387be3d96798e7b5c4d35accd3067d4095552387 /drivers/block/nvme-core.c | |
| parent | af2d9ca744af5e03390eeb3864d08ce75c860899 (diff) | |
| download | linux-3.10-1c9b52651dad0ff1fa71fc6205c86d972f25bcc0.tar.gz linux-3.10-1c9b52651dad0ff1fa71fc6205c86d972f25bcc0.tar.bz2 linux-3.10-1c9b52651dad0ff1fa71fc6205c86d972f25bcc0.zip | |
NVMe: Fix endian-related problems in user I/O submission path
When constructing the command, dsmgmt needs to be treated as a 32-bit
value, not a 16-bit value. reftag, apptag and appmask all need to be
converted from native-endian to little-endian. Again, sparse's bitwise
warnings caught this problem. Thanks to Keith for pointing out the
correct way to fix the reftag.
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Acked-by: Keith Busch <keith.busch@intel.com>
Diffstat (limited to 'drivers/block/nvme-core.c')
| -rw-r--r-- | drivers/block/nvme-core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index a3c7d504d5e..dbd2103533c 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -1166,10 +1166,10 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio) c.rw.slba = cpu_to_le64(io.slba); c.rw.length = cpu_to_le16(io.nblocks); c.rw.control = cpu_to_le16(io.control); - c.rw.dsmgmt = cpu_to_le16(io.dsmgmt); - c.rw.reftag = io.reftag; - c.rw.apptag = io.apptag; - c.rw.appmask = io.appmask; + c.rw.dsmgmt = cpu_to_le32(io.dsmgmt); + c.rw.reftag = cpu_to_le32(io.reftag); + c.rw.apptag = cpu_to_le16(io.apptag); + c.rw.appmask = cpu_to_le16(io.appmask); /* XXX: metadata */ length = nvme_setup_prps(dev, &c.common, iod, length, GFP_KERNEL); |