Removing redundant parameter from nvme_sec_send

diff --git a/nvme-ioctl.c b/nvme-ioctl.c
index f407b47b62b7e8ddb2646543d2ca3b7853d18a3d..9643cd05081fb2b4b86f9949d839325973b658d4 100644 (file)
--- 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 6149d629b4d09fc4b12eae625a22e15914098024..40231c196e792589754b1ddc5a4ed40f222677e4 100644 (file)
--- 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 12ad4593d958e057b365a9f24fd5c8cb4943da17..c63c6011fceac5ec2af9df574f01eef7742a1ff6 100644 (file)
--- 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 9b95cf660b586f62561f1bac1f813b9ac41e4ccf..eb42d35b05a460a195f02da9a243e08489546b74 100644 (file)
--- 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)