diff options
| author |   Jussi Kivilinna <jussi.kivilinna@mbnet.fi> | 2009-11-22 20:16:42 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2009-11-23 17:05:40 -0500 |
| commit | c1f8ca1d837148bf061d6ffa2038366e3cf0e4d7 (patch) | |
| tree | 99fca98ff500fedf95d68a0c6ae3772490d0d9ce /drivers/net/wireless/rndis_wlan.c | |
| parent | mac80211: Fix missing kernel-doc notation (diff) | |
| download | linux-dev-c1f8ca1d837148bf061d6ffa2038366e3cf0e4d7.tar.xz linux-dev-c1f8ca1d837148bf061d6ffa2038366e3cf0e4d7.zip | |
rndis_wlan: fix buffer overflow in rndis_query_oid
rndis_query_oid overwrites *len which stores buffer size to return full size
of received command and then uses *len with memcpy to fill buffer with
command.
Ofcourse memcpy should be done before replacing buffer size.
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rndis_wlan.c')
| -rw-r--r-- | drivers/net/wireless/rndis_wlan.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index aa1880add186..8b09b043bc4e 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c @@ -733,12 +733,13 @@ static int rndis_query_oid(struct usbnet *dev, __le32 oid, void *data, int *len) le32_to_cpu(u.get_c->status)); if (ret == 0) { + memcpy(data, u.buf + le32_to_cpu(u.get_c->offset) + 8, *len); + ret = le32_to_cpu(u.get_c->len); if (ret > *len) *len = ret; - memcpy(data, u.buf + le32_to_cpu(u.get_c->offset) + 8, *len); - ret = rndis_error_status(u.get_c->status); + ret = rndis_error_status(u.get_c->status); if (ret < 0) devdbg(dev, "rndis_query_oid(%s): device returned " "error, 0x%08x (%d)", oid_to_string(oid), |