nfit: acpi_nfit_ctl(): Check out_obj->type in the right place (43f89877) · Commits · 戴 / test

In the case of ND_CMD_CALL, we should also check out_obj->type. The patch uses out_obj->type, which is a short alias to out_obj->package.type. Fixes: ("nfit, libnvdimm: limited/whitelisted dimm command marshaling mechanism") Cc: <stable@vger.kernel.org> Signed-off-by:

Dexuan Cui <decui@microsoft.com> Signed-off-by:

Dan Williams <dan.j.williams@intel.com>

drivers/acpi/nfit/core.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -535,6 +535,13 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor nd_desc, struct nvdimm nvdimm,
		return -EINVAL;
		}

		if (out_obj->type != ACPI_TYPE_BUFFER) {
		dev_dbg(dev, "%s unexpected output object type cmd: %s type: %d\n",
		dimm_name, cmd_name, out_obj->type);
		rc = -EINVAL;
		goto out;
		}

		if (call_pkg) {
		call_pkg->nd_fw_size = out_obj->buffer.length;
		memcpy(call_pkg->nd_payload + call_pkg->nd_size_in,
		@@ -553,13 +560,6 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor nd_desc, struct nvdimm nvdimm,
		return 0;
		}

		if (out_obj->package.type != ACPI_TYPE_BUFFER) {
		dev_dbg(dev, "%s unexpected output object type cmd: %s type: %d\n",
		dimm_name, cmd_name, out_obj->type);
		rc = -EINVAL;
		goto out;
		}

		dev_dbg(dev, "%s cmd: %s output length: %d\n", dimm_name,
		cmd_name, out_obj->buffer.length);
		print_hex_dump_debug(cmd_name, DUMP_PREFIX_OFFSET, 4, 4,

Admin message