Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43f89877 authored by Dexuan Cui's avatar Dexuan Cui Committed by Dan Williams
Browse files

nfit: acpi_nfit_ctl(): Check out_obj->type in the right place 



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: 31eca76b ("nfit, libnvdimm: limited/whitelisted dimm command marshaling mechanism")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarDexuan Cui <decui@microsoft.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent f596c884

drivers/acpi/nfit/core.c

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

		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) {

	if (call_pkg) {

		call_pkg->nd_fw_size = out_obj->buffer.length;

		call_pkg->nd_fw_size = out_obj->buffer.length;

		memcpy(call_pkg->nd_payload + call_pkg->nd_size_in,

		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;

		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,

	dev_dbg(dev, "%s cmd: %s output length: %d\n", dimm_name,

			cmd_name, out_obj->buffer.length);

			cmd_name, out_obj->buffer.length);

	print_hex_dump_debug(cmd_name, DUMP_PREFIX_OFFSET, 4, 4,

	print_hex_dump_debug(cmd_name, DUMP_PREFIX_OFFSET, 4, 4,