From: Michal Nazarewicz <mina86@mina86.com>
To: Robert Baldyga <r.baldyga@samsung.com>, balbi@ti.com
Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org,
linux-kernel@vger.kernel.org, m.szyprowski@samsung.com,
andrzej.p@samsung.com, k.opasiak@samsung.com,
Robert Baldyga <r.baldyga@samsung.com>
Subject: Re: [PATCH v5 1/3] usb: gadget: f_fs: fix the redundant ep files problem
Date: Sun, 24 Aug 2014 16:14:36 +0200 [thread overview]
Message-ID: <xa1tsikmug8j.fsf@mina86.com> (raw)
In-Reply-To: <1408622959-4096-2-git-send-email-r.baldyga@samsung.com>
On Thu, Aug 21 2014, Robert Baldyga <r.baldyga@samsung.com> wrote:
> Up to now, when endpoint addresses in descriptors were non-consecutive,
> there were created redundant files, which could cause problems in kernel,
> when user tryed to read/write to them. It was result of fact that maximum
^^^^^ -- tried
> endpoint address was taken as total number of endpoints in funciton.
>
> This patch adds endpoint descriptors counting and storing their addresses
> in eps_addrmap to verify their cohesion in each speed.
>
> Endpoint address map would be also useful for further features, just like
> vitual endpoint address mapping.
>
> Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
> @@ -1853,14 +1860,23 @@ static int __ffs_data_do_entity(enum ffs_entity_type type,
> * Strings are indexed from 1 (0 is magic ;) reserved
> * for languages list or some such)
> */
> - if (*valuep > ffs->strings_count)
> - ffs->strings_count = *valuep;
> + if (*valuep > helper->ffs->strings_count)
> + helper->ffs->strings_count = *valuep;
> break;
>
> case FFS_ENDPOINT:
> - /* Endpoints are indexed from 1 as well. */
> - if ((*valuep & USB_ENDPOINT_NUMBER_MASK) > ffs->eps_count)
> - ffs->eps_count = (*valuep & USB_ENDPOINT_NUMBER_MASK);
> + d = (void *)desc;
> + helper->eps_count++;
> + if (helper->eps_count >= 15)
> + return -EINVAL;
> + if (!helper->ffs->eps_count && !helper->ffs->interfaces_count)
I'd check helper->ffs->eps_count only. helper->ffs->interfaces_count is
zero only because endpoints and interfaces are interpret at the same
time, but otherwise the interfaces_count is unrelated to what we're
doing here.
Also, perhaps adding a comment describing what !helper->ffs->eps_count
means makes sense here.
> + helper->ffs->eps_addrmap[helper->eps_count] =
> + d->bEndpointAddress;
> + else if (helper->ffs->eps_count < helper->eps_count)
> + return -EINVAL;
Doesn't this duplicate check in __ffs_data_got_descs?
> + else if (helper->ffs->eps_addrmap[helper->eps_count] !=
> + d->bEndpointAddress)
> + return -EINVAL;
> break;
> }
>
> @@ -2101,13 +2118,29 @@ static int __ffs_data_got_descs(struct ffs_data *ffs,
>
> /* Read descriptors */
> raw_descs = data;
> + helper.ffs = ffs;
> for (i = 0; i < 3; ++i) {
> if (!counts[i])
> continue;
> + helper.interfaces_count = 0;
> + helper.eps_count = 0;
> ret = ffs_do_descs(counts[i], data, len,
> - __ffs_data_do_entity, ffs);
> + __ffs_data_do_entity, &helper);
> if (ret < 0)
> goto error;
> + if (!ffs->eps_count && !ffs->interfaces_count) {
> + ffs->eps_count = helper.eps_count;
> + ffs->interfaces_count = helper.interfaces_count;
> + } else {
> + if (ffs->eps_count != helper.eps_count) {
> + ret = -EINVAL;
> + goto error;
> + }
> + if (ffs->interfaces_count != helper.interfaces_count) {
> + ret = -EINVAL;
> + goto error;
> + }
> + }
> data += ret;
> len -= ret;
> }
> @@ -2342,9 +2375,18 @@ static void ffs_event_add(struct ffs_data *ffs,
> spin_unlock_irqrestore(&ffs->ev.waitq.lock, flags);
> }
>
> -
> /* Bind/unbind USB function hooks *******************************************/
>
> +static int ffs_ep_addr2idx(struct ffs_data *ffs, u8 endpoint_address)
> +{
> + int i;
> +
> + for (i = 1; i < 15; ++i)
+ for (i = 1; i < ARRAY_SIZE(ffs->eps_addrmap); ++i)
> + if (ffs->eps_addrmap[i] == endpoint_address)
> + return i;
> + return -ENOENT;
> +}
> +
> static int __ffs_func_bind_do_descs(enum ffs_entity_type type, u8 *valuep,
> struct usb_descriptor_header *desc,
> void *priv)
--
Best regards, _ _
.o. | Liege of Serenely Enlightened Majesty of o' \,=./ `o
..o | Computer Science, Michał “mina86” Nazarewicz (o o)
ooo +--<mpn@google.com>--<xmpp:mina86@jabber.org>--ooO--(_)--Ooo--
next prev parent reply other threads:[~2014-08-24 14:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-21 12:09 [PATCH v5 0/3] usb: gadget: f_fs: userspace API fixes and improvements Robert Baldyga
2014-08-21 12:09 ` [PATCH v5 1/3] usb: gadget: f_fs: fix the redundant ep files problem Robert Baldyga
2014-08-24 14:14 ` Michal Nazarewicz [this message]
2014-08-25 8:08 ` Robert Baldyga
2014-08-21 12:09 ` [PATCH v5 2/3] usb: gadget: f_fs: add ioctl returning ep descriptor Robert Baldyga
2014-08-24 14:27 ` Michal Nazarewicz
2014-08-21 12:09 ` [PATCH v5 3/3] usb: gadget: f_fs: virtual endpoint address mapping Robert Baldyga
2014-08-24 14:31 ` Michal Nazarewicz
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=xa1tsikmug8j.fsf@mina86.com \
--to=mina86@mina86.com \
--cc=andrzej.p@samsung.com \
--cc=balbi@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=k.opasiak@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=r.baldyga@samsung.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).