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

Commit 53b85a44 authored by Jerry Hoemann's avatar Jerry Hoemann Committed by Dan Williams
Browse files

libnvdimm: passthru functions clear to send 



Have dsm functions called via the pass thru mechanism also
be checked against clear to send.

Signed-off-by: default avatarJerry Hoemann <jerry.hoemann@hpe.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent e6be2dcb

drivers/nvdimm/bus.c

+3 −1
Original line number Diff line number Diff line
@@ -910,6 +910,7 @@ static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm, 
	static char in_env[ND_CMD_MAX_ENVELOPE];

	const struct nd_cmd_desc *desc = NULL;

	unsigned int cmd = _IOC_NR(ioctl_cmd);

	unsigned int func = cmd;

	void __user *p = (void __user *) arg;

	struct device *dev = &nvdimm_bus->dev;

	struct nd_cmd_pkg pkg;
@@ -975,6 +976,7 @@ static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm, 
	}



	if (cmd == ND_CMD_CALL) {

		func = pkg.nd_command;

		dev_dbg(dev, "%s:%s, idx: %llu, in: %zu, out: %zu, len %zu\n",

				__func__, dimm_name, pkg.nd_command,

				in_len, out_len, buf_len);
@@ -1023,7 +1025,7 @@ static int __nd_ioctl(struct nvdimm_bus *nvdimm_bus, struct nvdimm *nvdimm, 
	}



	nvdimm_bus_lock(&nvdimm_bus->dev);

	rc = nd_cmd_clear_to_send(nvdimm_bus, nvdimm, cmd, buf);

	rc = nd_cmd_clear_to_send(nvdimm_bus, nvdimm, func, buf);

	if (rc)

		goto out_unlock;