rndis_wlan: fix buffer overflow in rndis_query_oid
PATCH 1/2 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 <[email protected]>
---
drivers/net/wireless/rndis_wlan.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/rndis_wlan.c +3 -2
@@ -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),
PATCH 2/2 rndis_wlan: disable stall workaround
Stall workaround doesn't work with bcm4320a devices like with bcm4320b. This workaround actually causes more stalls/device freeze on bcm4320a. Therefore disable stall workaround by default.
Signed-off-by Jussi Kivilinna <[email protected]>
---
drivers/net/wireless/rndis_wlan.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/rndis_wlan.c +3 -3
@@ -83,11 +83,11 @@ MODULE_PARM_DESC(roamdelta,"set roaming tendency: 0=aggressive, 1=moderate, " "2=conservative (default: moderate)"); -static int modparam_workaround_interval =500 ; +static int modparam_workaround_interval;module_param_named (workaround_interval, modparam_workaround_interval, int,0444 );MODULE_PARM_DESC (workaround_interval, -"set stall workaround interval in msecs (default: 500)" ); +"set stall workaround interval in msecs (0=disabled) (default: 0)" );/* various RNDIS OID defs */
@@ -2550,7 +2550,7 @@ static void rndis_device_poller(struct work_struct *work)/* Workaround transfer stalls on poor quality links. * TODO: find right way to fix these stalls (as stalls do not happen * with ndiswrapper/windows driver). */ -if (priv->last_qual <=25 ) { +if (priv->param_workaround_interval >0 && priv->last_qual <=25 ) {/* Decrease stats worker interval to catch stalls. * faster. Faster than 400-500ms causes packet loss, * Slower doesn't catch stalls fast enough.