From: Dan Carpenter <dan.carpenter@oracle.com>
To: kernel-janitors@vger.kernel.org
Subject: [patch] staging: ozwpan: prevent a couple of underflows
Date: Tue, 02 Jun 2015 12:20:25 +0000 [thread overview]
Message-ID: <20150602122025.GA30789@mwanda> (raw)
The underflow in OZ_DATA_F_ISOC_FIXED seems not harmful, but this patch
is a clean up and makes my static checker a bit happier.
The underflow in OZ_VENDOR_CLASS_RSP seems like it could result in
memory corruption.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/staging/ozwpan/ozusbsvc1.c b/drivers/staging/ozwpan/ozusbsvc1.c
index f660bb1..301fee8 100644
--- a/drivers/staging/ozwpan/ozusbsvc1.c
+++ b/drivers/staging/ozwpan/ozusbsvc1.c
@@ -342,12 +342,16 @@ static void oz_usb_handle_ep_data(struct oz_usb_ctx *usb_ctx,
case OZ_DATA_F_ISOC_FIXED: {
struct oz_isoc_fixed *body (struct oz_isoc_fixed *)data_hdr;
- int data_len = len-sizeof(struct oz_isoc_fixed)+1;
+ int data_len;
int unit_size = body->unit_size;
u8 *data = body->data;
int count;
int i;
+ if (len < sizeof(struct oz_isoc_fixed) - 1)
+ break;
+ data_len = len - (sizeof(struct oz_isoc_fixed) - 1);
+
if (!unit_size)
break;
count = data_len/unit_size;
@@ -427,6 +431,11 @@ void oz_usb_rx(struct oz_pd *pd, struct oz_elt *elt)
case OZ_VENDOR_CLASS_RSP: {
struct oz_vendor_class_rsp *body (struct oz_vendor_class_rsp *)usb_hdr;
+
+ if (elt->length <
+ sizeof(struct oz_vendor_class_rsp) - 1)
+ break;
+
oz_hcd_control_cnf(usb_ctx->hport, body->req_id,
body->rcode, body->data, elt->length-
sizeof(struct oz_vendor_class_rsp)+1);
reply other threads:[~2015-06-02 12:20 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20150602122025.GA30789@mwanda \
--to=dan.carpenter@oracle.com \
--cc=kernel-janitors@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