diff mbox

[ndctl,v2] libndctl, nfit: Fix in/out sizes for error injection commands

Message ID 20171109210856.11936-1-vishal.l.verma@intel.com (mailing list archive)
State Accepted
Commit 8bf0b1cf939f
Headers show

Commit Message

Verma, Vishal L Nov. 9, 2017, 9:08 p.m. UTC 
The input/output size bounds being set in the various nd_bus_cmd_new_*
helpers for error injection commands were larger than they needed to be,
and platforms could reject these. Fix the bounds to be exactly as the
spec describes.

Cc: Dan Williams <dan.j.williams@intel.com>
Reported-by: Dariusz Dokupil <dariusz.dokupil@intel.com>
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
---
 ndctl/lib/nfit.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

v2: set the in/out sizes based explicitly on the sizes/offsets in the
cmd structure so that their relationship becomes obvious (Dan).

Comments

Dan Williams Nov. 9, 2017, 9:12 p.m. UTC | #1 
On Thu, Nov 9, 2017 at 1:08 PM, Vishal Verma <vishal.l.verma@intel.com> wrote:
>
> The input/output size bounds being set in the various nd_bus_cmd_new_*
> helpers for error injection commands were larger than they needed to be,
> and platforms could reject these. Fix the bounds to be exactly as the
> spec describes.
>
> Cc: Dan Williams <dan.j.williams@intel.com>
> Reported-by: Dariusz Dokupil <dariusz.dokupil@intel.com>
> Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
> ---
>  ndctl/lib/nfit.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
>
> v2: set the in/out sizes based explicitly on the sizes/offsets in the
> cmd structure so that their relationship becomes obvious (Dan).

Looks good, thanks for fixing that up.
diff mbox

Patch

diff --git a/ndctl/lib/nfit.c b/ndctl/lib/nfit.c
index fb6af32..2ae3f07 100644
--- a/ndctl/lib/nfit.c
+++ b/ndctl/lib/nfit.c
@@ -164,9 +164,9 @@  struct ndctl_cmd *ndctl_bus_cmd_new_err_inj(struct ndctl_bus *bus)
 	cmd->status = 1;
 	pkg = (struct nd_cmd_pkg *)&cmd->cmd_buf[0];
 	pkg->nd_command = NFIT_CMD_ARS_INJECT_SET;
-	pkg->nd_size_in = (2 * sizeof(u64)) + sizeof(u32);
-	pkg->nd_size_out = cmd_length;
-	pkg->nd_fw_size = cmd_length;
+	pkg->nd_size_in = offsetof(struct nd_cmd_ars_err_inj, status);
+	pkg->nd_size_out = cmd_length - pkg->nd_size_in;
+	pkg->nd_fw_size = pkg->nd_size_out;
 	err_inj = (struct nd_cmd_ars_err_inj *)&pkg->nd_payload[0];
 	cmd->firmware_status = &err_inj->status;
 
@@ -193,9 +193,9 @@  struct ndctl_cmd *ndctl_bus_cmd_new_err_inj_clr(struct ndctl_bus *bus)
 	cmd->status = 1;
 	pkg = (struct nd_cmd_pkg *)&cmd->cmd_buf[0];
 	pkg->nd_command = NFIT_CMD_ARS_INJECT_CLEAR;
-	pkg->nd_size_in = 2 * sizeof(u64);
-	pkg->nd_size_out = cmd_length;
-	pkg->nd_fw_size = cmd_length;
+	pkg->nd_size_in = offsetof(struct nd_cmd_ars_err_inj_clr, status);
+	pkg->nd_size_out = cmd_length - pkg->nd_size_in;
+	pkg->nd_fw_size = pkg->nd_size_out;
 	err_inj_clr = (struct nd_cmd_ars_err_inj_clr *)&pkg->nd_payload[0];
 	cmd->firmware_status = &err_inj_clr->status;
 
@@ -224,9 +224,9 @@  struct ndctl_cmd *ndctl_bus_cmd_new_err_inj_stat(struct ndctl_bus *bus,
 	cmd->status = 1;
 	pkg = (struct nd_cmd_pkg *)&cmd->cmd_buf[0];
 	pkg->nd_command = NFIT_CMD_ARS_INJECT_GET;
-	pkg->nd_size_in = cmd_length;
+	pkg->nd_size_in = 0;
 	pkg->nd_size_out = cmd_length + buf_size;
-	pkg->nd_fw_size = cmd_length + buf_size;
+	pkg->nd_fw_size = pkg->nd_size_out;
 	err_inj_stat = (struct nd_cmd_ars_err_inj_stat *)&pkg->nd_payload[0];
 	cmd->firmware_status = &err_inj_stat->status;