aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Jiang <dave.jiang@intel.com>2018-07-11 13:10:11 -0400
committerDave Jiang <dave.jiang@intel.com>2018-07-11 13:25:24 -0400
commitee6581ceba7f8314b81b2f2a81f1cf3f67c679e2 (patch)
tree17853ef474ef89fe6a4ea78db734e0631bef5d7f
parent33cc2c9667561b224215e6dfb5bf98e8fa17914e (diff)
nfit: fix unchecked dereference in acpi_nfit_ctl
Incremental patch to fix the unchecked dereference in acpi_nfit_ctl. Reported by Dan Carpenter: "acpi/nfit: fix cmd_rc for acpi_nfit_ctl to always return a value" from Jun 28, 2018, leads to the following Smatch complaint: drivers/acpi/nfit/core.c:578 acpi_nfit_ctl() warn: variable dereferenced before check 'cmd_rc' (see line 411) drivers/acpi/nfit/core.c 410 411 *cmd_rc = -EINVAL; ^^^^^^^^^^^^^^^^^^ Patch adds unchecked dereference. Fixes: c1985cefd844 ("acpi/nfit: fix cmd_rc for acpi_nfit_ctl to always return a value") Signed-off-by: Dave Jiang <dave.jiang@intel.com>
-rw-r--r--drivers/acpi/nfit/core.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index b8040fed2a69..7c479002e798 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -408,7 +408,8 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm,
408 const guid_t *guid; 408 const guid_t *guid;
409 int rc, i; 409 int rc, i;
410 410
411 *cmd_rc = -EINVAL; 411 if (cmd_rc)
412 *cmd_rc = -EINVAL;
412 func = cmd; 413 func = cmd;
413 if (cmd == ND_CMD_CALL) { 414 if (cmd == ND_CMD_CALL) {
414 call_pkg = buf; 415 call_pkg = buf;
@@ -519,7 +520,8 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm,
519 * If we return an error (like elsewhere) then caller wouldn't 520 * If we return an error (like elsewhere) then caller wouldn't
520 * be able to rely upon data returned to make calculation. 521 * be able to rely upon data returned to make calculation.
521 */ 522 */
522 *cmd_rc = 0; 523 if (cmd_rc)
524 *cmd_rc = 0;
523 return 0; 525 return 0;
524 } 526 }
525 527