From: Ben Hutchings <ben@decadent•org.uk>
To: netdev@vger•kernel.org
Cc: linux-usb@vger•kernel.org, "Petko Manolov" <petkan@nucleusys•com>,
"Lisandro Damián Nicanor Pérez Meyer" <lisandro@debian•org>
Subject: [PATCH net 1/4] pegasus: Use heap buffers for all register access
Date: Sat, 4 Feb 2017 16:56:03 +0000 [thread overview]
Message-ID: <20170204165603.GV3442@decadent.org.uk> (raw)
In-Reply-To: <20170204165451.GU3442@decadent.org.uk>
[-- Attachment #1: Type: text/plain, Size: 2486 bytes --]
Allocating USB buffers on the stack is not portable, and no longer
works on x86_64 (with VMAP_STACK enabled as per default).
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
References: https://bugs.debian.org/852556
Reported-by: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian•org>
Tested-by: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian•org>
Signed-off-by: Ben Hutchings <ben@decadent•org.uk>
---
drivers/net/usb/pegasus.c | 29 +++++++++++++++++++++++++----
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 24e803fe9a53..36674484c6fb 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -126,40 +126,61 @@ static void async_ctrl_callback(struct urb *urb)
static int get_registers(pegasus_t *pegasus, __u16 indx, __u16 size, void *data)
{
+ u8 *buf;
int ret;
+ buf = kmalloc(size, GFP_NOIO);
+ if (!buf)
+ return -ENOMEM;
+
ret = usb_control_msg(pegasus->usb, usb_rcvctrlpipe(pegasus->usb, 0),
PEGASUS_REQ_GET_REGS, PEGASUS_REQT_READ, 0,
- indx, data, size, 1000);
+ indx, buf, size, 1000);
if (ret < 0)
netif_dbg(pegasus, drv, pegasus->net,
"%s returned %d\n", __func__, ret);
+ else if (ret <= size)
+ memcpy(data, buf, ret);
+ kfree(buf);
return ret;
}
-static int set_registers(pegasus_t *pegasus, __u16 indx, __u16 size, void *data)
+static int set_registers(pegasus_t *pegasus, __u16 indx, __u16 size,
+ const void *data)
{
+ u8 *buf;
int ret;
+ buf = kmemdup(data, size, GFP_NOIO);
+ if (!buf)
+ return -ENOMEM;
+
ret = usb_control_msg(pegasus->usb, usb_sndctrlpipe(pegasus->usb, 0),
PEGASUS_REQ_SET_REGS, PEGASUS_REQT_WRITE, 0,
- indx, data, size, 100);
+ indx, buf, size, 100);
if (ret < 0)
netif_dbg(pegasus, drv, pegasus->net,
"%s returned %d\n", __func__, ret);
+ kfree(buf);
return ret;
}
static int set_register(pegasus_t *pegasus, __u16 indx, __u8 data)
{
+ u8 *buf;
int ret;
+ buf = kmemdup(&data, 1, GFP_NOIO);
+ if (!buf)
+ return -ENOMEM;
+
ret = usb_control_msg(pegasus->usb, usb_sndctrlpipe(pegasus->usb, 0),
PEGASUS_REQ_SET_REG, PEGASUS_REQT_WRITE, data,
- indx, &data, 1, 1000);
+ indx, buf, 1, 1000);
if (ret < 0)
netif_dbg(pegasus, drv, pegasus->net,
"%s returned %d\n", __func__, ret);
+ kfree(buf);
return ret;
}
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 811 bytes --]
next prev parent reply other threads:[~2017-02-04 16:56 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-04 16:54 [PATCH net 0/4] Fix on-stack USB buffers Ben Hutchings
2017-02-04 16:56 ` Ben Hutchings [this message]
2017-02-05 0:30 ` [PATCH net 1/4] pegasus: Use heap buffers for all register access Greg KH
2017-02-06 8:14 ` Petko Manolov
2017-02-06 8:28 ` Greg KH
2017-02-06 12:51 ` Petko Manolov
2017-02-06 13:21 ` Johan Hovold
2017-02-06 13:32 ` Johan Hovold
2017-02-06 13:46 ` Johan Hovold
2017-02-07 10:24 ` Petko Manolov
2017-02-07 10:45 ` Greg KH
[not found] ` <20170207104506.GB32583-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
2017-02-07 12:50 ` Petko Manolov
2017-02-06 13:30 ` David Laight
2017-02-07 18:32 ` Steve Calfee
2017-02-08 7:57 ` Petko Manolov
2017-02-04 16:56 ` [PATCH net 2/4] rtl8150: " Ben Hutchings
2017-02-06 8:10 ` Petko Manolov
[not found] ` <20170204165631.GW3442-/+tVBieCtBitmTQ+vhA3Yw@public.gmane.org>
2017-02-06 16:09 ` David Laight
2017-02-06 16:25 ` Ben Hutchings
2017-02-07 10:34 ` Petko Manolov
2017-02-07 10:51 ` Greg KH
2017-02-07 11:56 ` David Laight
[not found] ` <063D6719AE5E284EB5DD2968C1650D6DB027DB75-VkEWCZq2GCInGFn1LkZF6NBPR1lH4CV8@public.gmane.org>
2017-02-07 12:42 ` 'Greg KH'
2017-02-07 12:53 ` Petko Manolov
2017-02-07 13:01 ` Greg KH
2017-02-07 13:20 ` Petko Manolov
2017-02-07 14:14 ` David Laight
2017-02-07 14:52 ` Petko Manolov
[not found] ` <20170204165451.GU3442-/+tVBieCtBitmTQ+vhA3Yw@public.gmane.org>
2017-02-04 16:56 ` [PATCH net 3/4] catc: Combine failure cleanup code in catc_probe() Ben Hutchings
2017-02-04 16:57 ` [PATCH net 4/4] catc: Use heap buffer for memory size test Ben Hutchings
2017-02-07 15:07 ` [PATCH net 0/4] Fix on-stack USB buffers David Miller
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=20170204165603.GV3442@decadent.org.uk \
--to=ben@decadent$(echo .)org.uk \
--cc=linux-usb@vger$(echo .)kernel.org \
--cc=lisandro@debian$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=petkan@nucleusys$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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