From: Ben Widawsky <ben.widawsky@intel.com>
To: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: linux-cxl@vger.kernel.org, linux-acpi@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-nvdimm@lists.01.org,
linux-pci@vger.kernel.org, Bjorn Helgaas <helgaas@kernel.org>,
Chris Browy <cbrowy@avery-design.com>,
Christoph Hellwig <hch@infradead.org>,
Dan Williams <dan.j.williams@intel.com>,
David Hildenbrand <david@redhat.com>,
David Rientjes <rientjes@google.com>,
Ira Weiny <ira.weiny@intel.com>, Jon Masters <jcm@jonmasters.org>,
Jonathan Cameron <Jonathan.Cameron@huawei.com>,
Rafael Wysocki <rafael.j.wysocki@intel.com>,
Randy Dunlap <rdunlap@infradead.org>,
Vishal Verma <vishal.l.verma@intel.com>,
"John Groves (jgroves)" <jgroves@micron.com>,
"Kelley, Sean V" <sean.v.kelley@intel.com>,
kernel test robot <lkp@intel.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Al Viro <viro@zeniv.linux.org.uk>
Subject: Re: [PATCH v5 4/9] cxl/mem: Add basic IOCTL interface
Date: Sat, 20 Feb 2021 08:33:44 -0800 [thread overview]
Message-ID: <20210220163344.csczmkyxkpu4fxah@intel.com> (raw)
In-Reply-To: <YDBkOB3K8UqVakFf@Konrads-MacBook-Pro.local>
On 21-02-19 20:22:00, Konrad Rzeszutek Wilk wrote:
> ..snip..
> > +static int handle_mailbox_cmd_from_user(struct cxl_mem *cxlm,
> > + const struct cxl_mem_command *cmd,
> > + u64 in_payload, u64 out_payload,
> > + s32 *size_out, u32 *retval)
> > +{
> > + struct device *dev = &cxlm->pdev->dev;
> > + struct mbox_cmd mbox_cmd = {
> > + .opcode = cmd->opcode,
> > + .size_in = cmd->info.size_in,
> > + .size_out = cmd->info.size_out,
> > + };
> > + int rc;
> > +
> > + if (cmd->info.size_out) {
> > + mbox_cmd.payload_out = kvzalloc(cmd->info.size_out, GFP_KERNEL);
> > + if (!mbox_cmd.payload_out)
> > + return -ENOMEM;
> > + }
> > +
> > + if (cmd->info.size_in) {
> > + mbox_cmd.payload_in = vmemdup_user(u64_to_user_ptr(in_payload),
> > + cmd->info.size_in);
> > + if (IS_ERR(mbox_cmd.payload_in))
> > + return PTR_ERR(mbox_cmd.payload_in);
>
> Not that this should happen, but what if info.size_out was set? Should
> you also free mbox_cmd.payload_out?
>
Thanks Konrad.
Dan, do you want me to send a fixup patch? This bug was introduced from v4->v5.
> > + }
> > +
> > + rc = cxl_mem_mbox_get(cxlm);
> > + if (rc)
> > + goto out;
> > +
> > + dev_dbg(dev,
> > + "Submitting %s command for user\n"
> > + "\topcode: %x\n"
> > + "\tsize: %ub\n",
> > + cxl_command_names[cmd->info.id].name, mbox_cmd.opcode,
> > + cmd->info.size_in);
> > +
> > + rc = __cxl_mem_mbox_send_cmd(cxlm, &mbox_cmd);
> > + cxl_mem_mbox_put(cxlm);
> > + if (rc)
> > + goto out;
> > +
> > + /*
> > + * @size_out contains the max size that's allowed to be written back out
> > + * to userspace. While the payload may have written more output than
> > + * this it will have to be ignored.
> > + */
> > + if (mbox_cmd.size_out) {
> > + dev_WARN_ONCE(dev, mbox_cmd.size_out > *size_out,
> > + "Invalid return size\n");
> > + if (copy_to_user(u64_to_user_ptr(out_payload),
> > + mbox_cmd.payload_out, mbox_cmd.size_out)) {
> > + rc = -EFAULT;
> > + goto out;
> > + }
> > + }
> > +
> > + *size_out = mbox_cmd.size_out;
> > + *retval = mbox_cmd.return_code;
> > +
> > +out:
> > + kvfree(mbox_cmd.payload_in);
> > + kvfree(mbox_cmd.payload_out);
> > + return rc;
> > +}
>
> ..snip..
>
> > +static int cxl_query_cmd(struct cxl_memdev *cxlmd,
> > + struct cxl_mem_query_commands __user *q)
> > +{
> > + struct device *dev = &cxlmd->dev;
> > + struct cxl_mem_command *cmd;
> > + u32 n_commands;
> > + int j = 0;
>
> How come it is 'j' instead of the usual 'i'?
Just how it got split out/copied from an earlier version of the series.
I think rename to i, or cmds would be best as well. I/Dan can do it as part of
the bug fix you found above.
> > +
> > + dev_dbg(dev, "Query IOCTL\n");
> > +
> > + if (get_user(n_commands, &q->n_commands))
> > + return -EFAULT;
> > +
> > + /* returns the total number if 0 elements are requested. */
> > + if (n_commands == 0)
> > + return put_user(cxl_cmd_count, &q->n_commands);
> > +
> > + /*
> > + * otherwise, return max(n_commands, total commands) cxl_command_info
> > + * structures.
> > + */
> > + cxl_for_each_cmd(cmd) {
> > + const struct cxl_command_info *info = &cmd->info;
> > +
> > + if (copy_to_user(&q->commands[j++], info, sizeof(*info)))
> > + return -EFAULT;
> > +
> > + if (j == n_commands)
> > + break;
> > + }
> > +
> > + return 0;
> > +}
> > +
next prev parent reply other threads:[~2021-02-20 16:34 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-17 4:09 [PATCH v5 0/9] CXL 2.0 Support Ben Widawsky
2021-02-17 4:09 ` [PATCH v5 1/9] cxl/mem: Introduce a driver for CXL-2.0-Type-3 endpoints Ben Widawsky
2021-02-20 0:54 ` Konrad Rzeszutek Wilk
2021-02-17 4:09 ` [PATCH v5 2/9] cxl/mem: Find device capabilities Ben Widawsky
2021-02-17 12:22 ` Jonathan Cameron
2021-02-17 4:09 ` [PATCH v5 3/9] cxl/mem: Register CXL memX devices Ben Widawsky
2021-02-17 4:09 ` [PATCH v5 4/9] cxl/mem: Add basic IOCTL interface Ben Widawsky
2021-02-17 14:16 ` Jonathan Cameron
2021-02-20 1:22 ` Konrad Rzeszutek Wilk
2021-02-20 16:33 ` Ben Widawsky [this message]
2021-02-20 17:48 ` Dan Williams
2021-02-17 4:09 ` [PATCH v5 5/9] cxl/mem: Add a "RAW" send command Ben Widawsky
2021-02-20 1:03 ` Konrad Rzeszutek Wilk
2021-02-17 4:09 ` [PATCH v5 6/9] cxl/mem: Enable commands via CEL Ben Widawsky
2021-02-20 1:11 ` Konrad Rzeszutek Wilk
2021-02-17 4:09 ` [PATCH v5 7/9] cxl/mem: Add set of informational commands Ben Widawsky
2021-02-20 1:12 ` Konrad Rzeszutek Wilk
2021-02-17 4:09 ` [PATCH v5 8/9] MAINTAINERS: Add maintainers of the CXL driver Ben Widawsky
2021-02-17 4:09 ` [RFC PATCH v5 9/9] cxl/mem: Add payload dumping for debug Ben Widawsky
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=20210220163344.csczmkyxkpu4fxah@intel.com \
--to=ben.widawsky@intel.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=cbrowy@avery-design.com \
--cc=dan.j.williams@intel.com \
--cc=david@redhat.com \
--cc=hch@infradead.org \
--cc=helgaas@kernel.org \
--cc=ira.weiny@intel.com \
--cc=jcm@jonmasters.org \
--cc=jgroves@micron.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-cxl@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvdimm@lists.01.org \
--cc=linux-pci@vger.kernel.org \
--cc=lkp@intel.com \
--cc=rafael.j.wysocki@intel.com \
--cc=rdunlap@infradead.org \
--cc=rientjes@google.com \
--cc=sean.v.kelley@intel.com \
--cc=sfr@canb.auug.org.au \
--cc=viro@zeniv.linux.org.uk \
--cc=vishal.l.verma@intel.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).