From: fixthething <79883270+fixthething@users.noreply.github.com>
Date: Sat, 20 Mar 2021 13:53:50 +0000 (-0400)
Subject: Removing redundant parameter from nvme_sec_send
X-Git-Tag: v1.15~3^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=04f12c81cc2d9adbe04dadf9b4828541be5c2bf2;p=users%2Fsagi%2Fnvme-cli.git

Removing redundant parameter from nvme_sec_send
---

diff --git a/nvme-ioctl.c b/nvme-ioctl.c
index f407b47b..9643cd05 100644
--- a/nvme-ioctl.c
+++ b/nvme-ioctl.c
@@ -839,7 +839,7 @@ int nvme_fw_commit(int fd, __u8 slot, __u8 action, __u8 bpid)
 }
 
 int nvme_sec_send(int fd, __u32 nsid, __u8 nssf, __u16 spsp,
-		  __u8 secp, __u32 tl, __u32 data_len, void *data)
+		  __u8 secp, __u32 data_len, void *data)
 {
 	struct nvme_admin_cmd cmd = {
 		.opcode		= nvme_admin_security_send,
@@ -847,7 +847,7 @@ int nvme_sec_send(int fd, __u32 nsid, __u8 nssf, __u16 spsp,
 		.data_len	= data_len,
 		.nsid		= nsid,
 		.cdw10		= secp << 24 | spsp << 8 | nssf,
-		.cdw11		= tl,
+		.cdw11		= data_len,
 	};
 
 	return nvme_submit_admin_passthru(fd, &cmd);
diff --git a/nvme-ioctl.h b/nvme-ioctl.h
index 6149d629..40231c19 100644
--- a/nvme-ioctl.h
+++ b/nvme-ioctl.h
@@ -139,7 +139,7 @@ int nvme_fw_download(int fd, __u32 offset, __u32 data_len, void *data);
 int nvme_fw_commit(int fd, __u8 slot, __u8 action, __u8 bpid);
 
 int nvme_sec_send(int fd, __u32 nsid, __u8 nssf, __u16 spsp,
-		  __u8 secp, __u32 tl, __u32 data_len, void *data);
+		  __u8 secp, __u32 data_len, void *data);
 int nvme_sec_recv(int fd, __u32 nsid, __u8 nssf, __u16 spsp,
 		  __u8 secp, __u32 al, __u32 data_len, void *data);
 
diff --git a/nvme-rpmb.c b/nvme-rpmb.c
index 12ad4593..c63c6011 100644
--- a/nvme-rpmb.c
+++ b/nvme-rpmb.c
@@ -266,7 +266,7 @@ struct rpmb_config_block_t {
 #define RPMB_NVME_SPSP        0x0001
 
 #define SEND_RPMB_REQ(tgt, size, req) \
-nvme_sec_send(fd, 0, tgt, RPMB_NVME_SPSP, RPMB_NVME_SECP, size, size, \
+nvme_sec_send(fd, 0, tgt, RPMB_NVME_SPSP, RPMB_NVME_SECP, size, \
 		(unsigned char *)(req))
 	
 #define RECV_RPMB_RSP(tgt, size, rsp) \
diff --git a/nvme.c b/nvme.c
index 9b95cf66..eb42d35b 100644
--- a/nvme.c
+++ b/nvme.c
@@ -3681,7 +3681,7 @@ static int sec_send(int argc, char **argv, struct command *cmd, struct plugin *p
 		goto close_sec_fd;
 	}
 
-	memset(sec_buf, 0, cfg.tl); // ensure zero fill if buf_size > sec_size
+	memset(sec_buf, 0, cfg.tl); // ensure zero fill if cfg.tl > sec_size
 
 	err = read(sec_fd, sec_buf, sec_size);
 	if (err < 0) {
@@ -3692,7 +3692,7 @@ static int sec_send(int argc, char **argv, struct command *cmd, struct plugin *p
 	}
 
 	err = nvme_sec_send(fd, cfg.namespace_id, cfg.nssf, cfg.spsp, cfg.secp,
-			cfg.tl, cfg.tl, sec_buf);
+			cfg.tl, sec_buf);
 	if (err < 0)
 		perror("security-send");
 	else if (err != 0)