nfit: fix unchecked dereference in acpi_nfit_ctl
authorDave Jiang <dave.jiang@intel.com>
Wed, 11 Jul 2018 17:10:11 +0000 (10:10 -0700)
committerDave Jiang <dave.jiang@intel.com>
Wed, 11 Jul 2018 17:25:24 +0000 (10:25 -0700)
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>
drivers/acpi/nfit/core.c

index b8040fed2a69034001ed0d4af3e1534904a9f81c..7c479002e798bf92f3dc58263c3c2064182922bb 100644 (file)
@@ -408,7 +408,8 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm,
        const guid_t *guid;
        int rc, i;
 
-       *cmd_rc = -EINVAL;
+       if (cmd_rc)
+               *cmd_rc = -EINVAL;
        func = cmd;
        if (cmd == ND_CMD_CALL) {
                call_pkg = buf;
@@ -519,7 +520,8 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm,
                 * If we return an error (like elsewhere) then caller wouldn't
                 * be able to rely upon data returned to make calculation.
                 */
-               *cmd_rc = 0;
+               if (cmd_rc)
+                       *cmd_rc = 0;
                return 0;
        }