From: Jerry Hoemann <jerry.hoemann@hpe.com> To: dan.j.williams@intel.com Cc: linux-kernel@vger.kernel.org, linux-nvdimm@lists.01.org Subject: [PATCH v2 1/7] libnvdimm: passthru functions clear to send Date: Tue, 20 Jun 2017 10:51:20 -0600 [thread overview] Message-ID: <4454f90ea68f67a04546d92b22901c20b540e99e.1497939166.git.jerry.hoemann@hpe.com> (raw) In-Reply-To: <cover.1497939166.git.jerry.hoemann@hpe.com> In-Reply-To: <cover.1497939166.git.jerry.hoemann@hpe.com> Have dsm functions called via the pass thru mechanism also be checked against clear to send. Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.com> --- drivers/nvdimm/bus.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c index e9361bf..e16427d 100644 --- a/drivers/nvdimm/bus.c +++ b/drivers/nvdimm/bus.c @@ -907,6 +907,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; @@ -972,6 +973,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); @@ -1020,7 +1022,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; -- 1.8.5.6 _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm
WARNING: multiple messages have this Message-ID (diff)
From: Jerry Hoemann <jerry.hoemann@hpe.com> To: dan.j.williams@intel.com Cc: linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org, Jerry Hoemann <jerry.hoemann@hpe.com> Subject: [PATCH v2 1/7] libnvdimm: passthru functions clear to send Date: Tue, 20 Jun 2017 10:51:20 -0600 [thread overview] Message-ID: <4454f90ea68f67a04546d92b22901c20b540e99e.1497939166.git.jerry.hoemann@hpe.com> (raw) In-Reply-To: <cover.1497939166.git.jerry.hoemann@hpe.com> In-Reply-To: <cover.1497939166.git.jerry.hoemann@hpe.com> Have dsm functions called via the pass thru mechanism also be checked against clear to send. Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.com> --- drivers/nvdimm/bus.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c index e9361bf..e16427d 100644 --- a/drivers/nvdimm/bus.c +++ b/drivers/nvdimm/bus.c @@ -907,6 +907,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; @@ -972,6 +973,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); @@ -1020,7 +1022,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; -- 1.8.5.6
next prev parent reply other threads:[~2017-06-20 16:50 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-06-20 16:51 [PATCH v2 0/7] Enable DSM pass thru for root functions Jerry Hoemann 2017-06-20 16:51 ` Jerry Hoemann 2017-06-20 16:51 ` Jerry Hoemann [this message] 2017-06-20 16:51 ` [PATCH v2 1/7] libnvdimm: passthru functions clear to send Jerry Hoemann 2017-06-20 16:51 ` [PATCH v2 2/7] acpi, nfit: Enable DSM pass thru for root functions Jerry Hoemann 2017-06-20 16:51 ` Jerry Hoemann 2017-06-20 16:51 ` [PATCH v2 3/7] libnvdimm: Add bus level dsm mask Jerry Hoemann 2017-06-20 16:51 ` Jerry Hoemann 2017-06-20 16:51 ` [PATCH v2 4/7] acpi, nfit: Use bus_dsm_mask for passthru Jerry Hoemann 2017-06-20 16:51 ` Jerry Hoemann 2017-06-28 21:09 ` Dan Williams 2017-06-28 21:09 ` Dan Williams 2017-06-20 16:51 ` [PATCH v2 5/7] acpi, nfit: Show bus_dsm_mask Jerry Hoemann 2017-06-20 16:51 ` Jerry Hoemann 2017-06-28 21:07 ` Dan Williams 2017-06-28 21:07 ` Dan Williams 2017-06-28 23:15 ` Jerry Hoemann 2017-06-28 23:15 ` Jerry Hoemann 2017-06-28 23:29 ` Dan Williams 2017-06-28 23:29 ` Dan Williams 2017-06-28 23:31 ` Dan Williams 2017-06-28 23:31 ` Dan Williams 2017-06-20 16:51 ` [PATCH v2 6/7] libnvdimm: New ACPI 6.2 DSM functions Jerry Hoemann 2017-06-20 16:51 ` Jerry Hoemann 2017-06-28 21:11 ` Dan Williams 2017-06-28 21:11 ` Dan Williams 2017-06-20 16:51 ` [PATCH v2 7/7] acpi, nfit: override mask Jerry Hoemann 2017-06-20 16:51 ` Jerry Hoemann 2017-06-26 17:37 ` [PATCH v2 0/7] Enable DSM pass thru for root functions Jerry Hoemann 2017-06-26 17:37 ` Jerry Hoemann
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=4454f90ea68f67a04546d92b22901c20b540e99e.1497939166.git.jerry.hoemann@hpe.com \ --to=jerry.hoemann@hpe.com \ --cc=dan.j.williams@intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nvdimm@lists.01.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.