From: Tal Shorer <tal.shorer@gmail.com>
To: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-usb@vger.kernel.org, gregkh@linuxfoundation.org,
balbi@kernel.org, corbet@lwn.net
Cc: Tal Shorer <tal.shorer@gmail.com>
Subject: [PATCH v2 3/8] usb: gadget: f_acm: validate set_line_coding requests
Date: Tue, 13 Jun 2017 09:52:09 +0300 [thread overview]
Message-ID: <1497336734-19368-4-git-send-email-tal.shorer@gmail.com> (raw)
In-Reply-To: <1497336734-19368-1-git-send-email-tal.shorer@gmail.com>
We shouldn't accept malformed set_line_coding requests.
All values were taken from table 17 (section 6.3.11) of the cdc1.2 spec
available at http://www.usb.org/developers/docs/devclass_docs/
The table is in the file PTSN120.pdf.
Signed-off-by: Tal Shorer <tal.shorer@gmail.com>
---
drivers/usb/gadget/function/f_acm.c | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/drivers/usb/gadget/function/f_acm.c b/drivers/usb/gadget/function/f_acm.c
index 5e3828d..e023313 100644
--- a/drivers/usb/gadget/function/f_acm.c
+++ b/drivers/usb/gadget/function/f_acm.c
@@ -326,13 +326,22 @@ static void acm_complete_set_line_coding(struct usb_ep *ep,
struct usb_cdc_line_coding *value = req->buf;
/* REVISIT: we currently just remember this data.
- * If we change that, (a) validate it first, then
- * (b) update whatever hardware needs updating,
- * (c) worry about locking. This is information on
- * the order of 9600-8-N-1 ... most of which means
- * nothing unless we control a real RS232 line.
- */
- acm->port_line_coding = *value;
+ * If we change that,
+ * (a) update whatever hardware needs updating,
+ * (b) worry about locking. This is information on
+ * the order of 9600-8-N-1 ... most of which means
+ * nothing unless we control a real RS232 line.
+ */
+ dev_dbg(&cdev->gadget->dev,
+ "acm ttyGS%d set_line_coding: %d %d %d %d\n",
+ acm->port_num, le32_to_cpu(value->dwDTERate),
+ value->bCharFormat, value->bParityType,
+ value->bDataBits);
+ if (value->bCharFormat > 2 || value->bParityType > 4 ||
+ value->bDataBits < 5 || value->bDataBits > 8)
+ usb_ep_set_halt(ep);
+ else
+ acm->port_line_coding = *value;
}
}
--
2.7.4
next prev parent reply other threads:[~2017-06-13 6:52 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-13 6:52 [PATCH v2 0/8] Allow f_acm gadgets to notify the user about SetLineCoding requests Tal Shorer
2017-06-13 6:52 ` [PATCH v2 1/8] tty: add a poll() callback in struct tty_operations Tal Shorer
2017-06-14 1:15 ` Alan Cox
2017-06-14 8:20 ` Tal Shorer
2017-06-14 8:27 ` Tal Shorer
2017-06-14 13:33 ` Alan Cox
2017-06-15 14:44 ` Tal Shorer
2017-06-13 6:52 ` [PATCH v2 2/8] usb: gadget: u_serial: propagate poll() to the next layer Tal Shorer
2017-06-13 6:52 ` Tal Shorer [this message]
2017-06-13 6:52 ` [PATCH v2 4/8] usb: gadget: u_serial: propagate ioctl() " Tal Shorer
2017-06-13 6:52 ` [PATCH v2 5/8] usb: gadget: f_acm: initialize port_line_coding when creating an instance Tal Shorer
2017-06-13 6:52 ` [PATCH v2 6/8] usb: gadget: f_acm: add an ioctl to get the current line coding Tal Shorer
2017-06-13 9:19 ` Greg KH
2017-06-13 9:24 ` Tal Shorer
2017-06-13 6:52 ` [PATCH v2 7/8] usb: gadget: f_acm: notify the user on SetLineCoding Tal Shorer
2017-06-13 6:52 ` [PATCH v2 8/8] usb: gadget: u_serial: remove port_line_config from struct gserial Tal Shorer
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=1497336734-19368-4-git-send-email-tal.shorer@gmail.com \
--to=tal.shorer@gmail.com \
--cc=balbi@kernel.org \
--cc=corbet@lwn.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@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;
as well as URLs for NNTP newsgroup(s).