diff options
| author |   Avinash Patil <patila@marvell.com> | 2014-09-12 20:08:46 +0530 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2014-09-15 15:00:50 -0400 |
| commit | 3c99832d74777c9ec5545a92450fac5d37b0d0e1 (patch) | |
| tree | 2df41a172c90417e2175dcc424f94d3f86a7df37 /drivers/net/wireless/mwifiex/tdls.c | |
| parent | mwifiex: set fw api info for backword compatibility (diff) | |
| download | linux-dev-3c99832d74777c9ec5545a92450fac5d37b0d0e1.tar.xz linux-dev-3c99832d74777c9ec5545a92450fac5d37b0d0e1.zip | |
mwifiex: fix probable memory corruption while processing TDLS frame
Size of RSN IE buffer in driver is 254 while maximum size of received buffer
to be copied to RSN IE buffer can be 255. Add boundary check to copy maximum
of 254 bytes into RSN IE buffer.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Avinash Patil <patila@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwifiex/tdls.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/tdls.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/tdls.c b/drivers/net/wireless/mwifiex/tdls.c index 4c5fd953893d..e2949077f5b5 100644 --- a/drivers/net/wireless/mwifiex/tdls.c +++ b/drivers/net/wireless/mwifiex/tdls.c @@ -871,7 +871,9 @@ void mwifiex_process_tdls_action_frame(struct mwifiex_private *priv, break; case WLAN_EID_RSN: memcpy((u8 *)&sta_ptr->tdls_cap.rsn_ie, pos, - sizeof(struct ieee_types_header) + pos[1]); + sizeof(struct ieee_types_header) + + min_t(u8, pos[1], IEEE_MAX_IE_SIZE - + sizeof(struct ieee_types_header))); break; case WLAN_EID_QOS_CAPA: sta_ptr->tdls_cap.qos_info = pos[2]; |