From: Kamal Heib <kamalheib1@gmail.com>
To: Jason Gunthorpe <jgg@ziepe.ca>
Cc: linux-rdma@vger.kernel.org, Doug Ledford <dledford@redhat.com>
Subject: Re: [PATCH for-next] RDMA/core: Fix storing node_desc
Date: Sun, 12 Jan 2020 22:02:52 +0200 [thread overview]
Message-ID: <20200112200252.GA5112@kheib-workstation> (raw)
In-Reply-To: <20200103231212.GA18973@ziepe.ca>
On Fri, Jan 03, 2020 at 07:12:12PM -0400, Jason Gunthorpe wrote:
> On Mon, Dec 23, 2019 at 11:39:43AM +0200, Kamal Heib wrote:
> > When writing to node_desc sysfs using echo a new line symbol will be
> > stored at the end of the string, avoid that by dropping the new line
>
> Why do we want to do this? AFAIK technically new line is valid in a
> node description.
>
Self-Nack, please drop this patch, I didn't do a good job here.
Thanks,
Kamal
> > symbol and also make sure to return -EINVAL when the supplied string is
> > bigger then IB_DEVICE_NODE_DESC_MAX.
>
> This makes sense though
>
> > diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
> > index 087682e6969e..2de5f6710c0b 100644
> > +++ b/drivers/infiniband/core/sysfs.c
> > @@ -1263,12 +1263,21 @@ static ssize_t node_desc_store(struct device *device,
> > {
> > struct ib_device *dev = rdma_device_to_ibdev(device);
> > struct ib_device_modify desc = {};
> > + size_t len;
> > int ret;
> >
> > if (!dev->ops.modify_device)
> > return -EOPNOTSUPP;
> >
> > - memcpy(desc.node_desc, buf, min_t(int, count, IB_DEVICE_NODE_DESC_MAX));
>
> > + if (count > IB_DEVICE_NODE_DESC_MAX)
> > + return -EINVAL;
> > +
> > + len = strlen(buf);
>
> Why strlen? The buf is count bytes long.
>
> > + if (buf[len - 1] == '\n')
> > + len--;
>
> And if it is zero bytes this buffer underflows
>
> > + strncpy(desc.node_desc, buf, len);
>
> What was the point of switching away from memcpy?
>
> > + desc.node_desc[len] = 0;
> > ret = ib_modify_device(dev, IB_DEVICE_MODIFY_NODE_DESC, &desc);
> > if (ret)
> > return ret;
>
> Jason
prev parent reply other threads:[~2020-01-12 20:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-23 9:39 [PATCH for-next] RDMA/core: Fix storing node_desc Kamal Heib
2020-01-03 23:12 ` Jason Gunthorpe
2020-01-12 20:02 ` Kamal Heib [this message]
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=20200112200252.GA5112@kheib-workstation \
--to=kamalheib1@gmail.com \
--cc=dledford@redhat.com \
--cc=jgg@ziepe.ca \
--cc=linux-rdma@vger.kernel.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: 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