Skip to contentSkip to conversation

Add data transfer length check for admin commands

PATCH New Prasad Joshi 2 participants 2 messages Sep 2, 2013 – Sep 3, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Add data transfer length check for admin commands

From: Prasad Joshi <[email protected]>

According to NVM Express 1.1 specifications, the lower 2 bits of a NVME command opcode indicates, the data transfer (Figure 38). Zero value of these two bits indicates, data length in actual NVME command is not required. Similarly non-zero value indicates mandatory data transfer length. The patch adds a verification of these bits along with correct value of data transfer length.

Suggested-by Matthew Wilcox <willy at linux.intel.com>
Signed-off-by Prasad Joshi <pjoshi at stec-inc.com>
Signed-off-by Anup Shendkar <ashendkar at stec-inc.com>
---
 drivers/block/nvme-core.c | 3 +++
 include/linux/nvme.h      | 7 +++++++
 2 files changed, 10 insertions(+)
drivers/block/nvme-core.c +3 -0
index ce79a59..256278e 100644
@@ -1402,6 +1402,9 @@ static int nvme_user_admin_cmd(struct nvme_dev *dev,
 		return -EACCES;
 	if (copy_from_user(&cmd, ucmd, sizeof(cmd)))
 		return -EFAULT;
+	if (((cmd.opcode & NVME_ADMIN_CMD_DATA_XFER_MASK) && !cmd.data_len) ||
+		(!(cmd.opcode & NVME_ADMIN_CMD_DATA_XFER_MASK) && cmd.data_len))
+		return -EINVAL;
 
 	memset(&c, 0, sizeof(c));
 	c.common.opcode = cmd.opcode;
include/linux/nvme.h +7 -0
index f451c8d..3b2c8ee 100644
@@ -508,6 +508,13 @@ struct nvme_admin_cmd {
 #define NVME_IOCTL_ADMIN_CMD	_IOWR('N', 0x41, struct nvme_admin_cmd)
 #define NVME_IOCTL_SUBMIT_IO	_IOW('N', 0x42, struct nvme_user_io)
 
+/*
+ * The 2 LSB bits of NVME Admin command opcode are called as data transfer bits.
+ * These two bits define where a command should include data transfer
+ * information.
+ */
+#define NVME_ADMIN_CMD_DATA_XFER_MASK (0b11)
+
 #ifdef __KERNEL__
 #include <linux/pci.h>
 #include <linux/miscdevice.h>
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/1 Add data transfer length check for admin commands

include/linux/nvme.h

Quoted 1 line · Prasad Joshi
include/linux/nvme.h +0 -0

I think you generated this patch against Linus' tree rather than the NVMe tree (http://git.infradead.org/users/willy/linux-nvme.git). The __KERNEL__ ifdefs are gone due to the separation of this file into the uapi and non-uapi versions.

include/linux/nvme.h struct nvme_admin_cmd { · line 517

Quoted 7 lines
include/linux/nvme.h +7 -0
+/*
+ * The 2 LSB bits of NVME Admin command opcode are called as data transfer bits.
+ * These two bits define where a command should include data transfer
+ * information.
+ */
+#define NVME_ADMIN_CMD_DATA_XFER_MASK (0b11)
+

Binary constants are a GCC extension, which I would prefer to avoid. They're only available from gcc 4.3 onwards, and apparently we still support gcc versions as old as 3.2.

The bits aren't just for admin commands (so we should correct both the comment and the name of the constant). How about adding:

	NVME_DATA_XFER_NONE	= 0,
	NVME_DATA_XFER_READ	= 1,
	NVME_DATA_XFER_WRITE	= 2,
	NVME_DATA_XFER_BIDI	= 3,
	NVME_DATA_XFER_MASK	= 3,

to the 'enum nvme_opcode' definition?