2009-12-01 03:45:29

by Zhu Yi

Subject: [PATCH] iwmc3200wifi: fix NULL pointer dereference in pmkid update

When handling IWM_CMD_PMKID_FLUSH command, the bssid and
pmkid in pmksa are all NULL. Check it before memcpy.

Cc: Samuel Ortiz <[email protected]>
Signed-off-by: Zhu Yi <[email protected]>
---
drivers/net/wireless/iwmc3200wifi/commands.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/iwmc3200wifi/commands.c b/drivers/net/wireless/iwmc3200wifi/commands.c
index bd06307..89b33fa 100644
--- a/drivers/net/wireless/iwmc3200wifi/commands.c
+++ b/drivers/net/wireless/iwmc3200wifi/commands.c
@@ -970,8 +970,10 @@ int iwm_send_pmkid_update(struct iwm_priv *iwm,
memset(&update, 0, sizeof(struct iwm_umac_pmkid_update));

update.command = cpu_to_le32(command);
- memcpy(&update.bssid, pmksa->bssid, ETH_ALEN);
- memcpy(&update.pmkid, pmksa->pmkid, WLAN_PMKID_LEN);
+ if (pmksa->bssid)
+ memcpy(&update.bssid, pmksa->bssid, ETH_ALEN);
+ if (pmksa->pmkid)
+ memcpy(&update.pmkid, pmksa->pmkid, WLAN_PMKID_LEN);

ret = iwm_send_wifi_if_cmd(iwm, &update,
sizeof(struct iwm_umac_pmkid_update), 0);
--
1.6.0.4

2009-12-01 10:20:33

by Samuel Ortiz

Subject: Re: [PATCH] iwmc3200wifi: fix NULL pointer dereference in pmkid update

On Tue, Dec 01, 2009 at 11:48:50AM +0800, Zhu Yi wrote:
> When handling IWM_CMD_PMKID_FLUSH command, the bssid and
> pmkid in pmksa are all NULL. Check it before memcpy.
>
> Cc: Samuel Ortiz <[email protected]>
> Signed-off-by: Zhu Yi <[email protected]>
Acked-by: Samuel Ortiz <[email protected]>

Good catch, thanks Yi.

Cheers,
Samuel.

> ---
> drivers/net/wireless/iwmc3200wifi/commands.c | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/iwmc3200wifi/commands.c b/drivers/net/wireless/iwmc3200wifi/commands.c
> index bd06307..89b33fa 100644
> --- a/drivers/net/wireless/iwmc3200wifi/commands.c
> +++ b/drivers/net/wireless/iwmc3200wifi/commands.c
> @@ -970,8 +970,10 @@ int iwm_send_pmkid_update(struct iwm_priv *iwm,
> memset(&update, 0, sizeof(struct iwm_umac_pmkid_update));
>
> update.command = cpu_to_le32(command);
> - memcpy(&update.bssid, pmksa->bssid, ETH_ALEN);
> - memcpy(&update.pmkid, pmksa->pmkid, WLAN_PMKID_LEN);
> + if (pmksa->bssid)
> + memcpy(&update.bssid, pmksa->bssid, ETH_ALEN);
> + if (pmksa->pmkid)
> + memcpy(&update.pmkid, pmksa->pmkid, WLAN_PMKID_LEN);
>
> ret = iwm_send_wifi_if_cmd(iwm, &update,
> sizeof(struct iwm_umac_pmkid_update), 0);
> --
> 1.6.0.4
>

--
Intel Open Source Technology Centre
http://oss.intel.com/