Skip to content

Commit

Permalink
ath6kl: Fix potential skb double free in ath6kl_wmi_sync_point()
Browse files Browse the repository at this point in the history
skb given to ath6kl_control_tx() is owned by ath6kl_control_tx().
Calling function should not free the skb for error cases.
This is found during code review.

kvalo: fix a checkpatch warning in ath6kl_wmi_cmd_send()

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
  • Loading branch information
Vasanthakumar Thiagarajan authored and Kalle Valo committed Oct 24, 2012
1 parent f21243a commit 0616dc1
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 17 deletions.
4 changes: 3 additions & 1 deletion drivers/net/wireless/ath/ath6kl/txrx.c
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,10 @@ int ath6kl_control_tx(void *devt, struct sk_buff *skb,
int status = 0;
struct ath6kl_cookie *cookie = NULL;

if (WARN_ON_ONCE(ar->state == ATH6KL_STATE_WOW))
if (WARN_ON_ONCE(ar->state == ATH6KL_STATE_WOW)) {
dev_kfree_skb(skb);
return -EACCES;
}

spin_lock_bh(&ar->lock);

Expand Down
35 changes: 19 additions & 16 deletions drivers/net/wireless/ath/ath6kl/wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1739,8 +1739,11 @@ int ath6kl_wmi_cmd_send(struct wmi *wmi, u8 if_idx, struct sk_buff *skb,
int ret;
u16 info1;

if (WARN_ON(skb == NULL || (if_idx > (wmi->parent_dev->vif_max - 1))))
if (WARN_ON(skb == NULL ||
(if_idx > (wmi->parent_dev->vif_max - 1)))) {
dev_kfree_skb(skb);
return -EINVAL;
}

ath6kl_dbg(ATH6KL_DBG_WMI, "wmi tx id %d len %d flag %d\n",
cmd_id, skb->len, sync_flag);
Expand Down Expand Up @@ -2352,8 +2355,10 @@ static int ath6kl_wmi_data_sync_send(struct wmi *wmi, struct sk_buff *skb,
struct wmi_data_hdr *data_hdr;
int ret;

if (WARN_ON(skb == NULL || ep_id == wmi->ep_id))
if (WARN_ON(skb == NULL || ep_id == wmi->ep_id)) {
dev_kfree_skb(skb);
return -EINVAL;
}

skb_push(skb, sizeof(struct wmi_data_hdr));

Expand Down Expand Up @@ -2390,10 +2395,8 @@ static int ath6kl_wmi_sync_point(struct wmi *wmi, u8 if_idx)
spin_unlock_bh(&wmi->lock);

skb = ath6kl_wmi_get_new_buf(sizeof(*cmd));
if (!skb) {
ret = -ENOMEM;
goto free_skb;
}
if (!skb)
return -ENOMEM;

cmd = (struct wmi_sync_cmd *) skb->data;

Expand All @@ -2416,7 +2419,7 @@ static int ath6kl_wmi_sync_point(struct wmi *wmi, u8 if_idx)
* then do not send the Synchronize cmd on the control ep
*/
if (ret)
goto free_skb;
goto free_cmd_skb;

/*
* Send sync cmd followed by sync data messages on all
Expand All @@ -2426,15 +2429,12 @@ static int ath6kl_wmi_sync_point(struct wmi *wmi, u8 if_idx)
NO_SYNC_WMIFLAG);

if (ret)
goto free_skb;

/* cmd buffer sent, we no longer own it */
skb = NULL;
goto free_data_skb;

for (index = 0; index < num_pri_streams; index++) {

if (WARN_ON(!data_sync_bufs[index].skb))
break;
goto free_data_skb;

ep_id = ath6kl_ac2_endpoint_id(wmi->parent_dev,
data_sync_bufs[index].
Expand All @@ -2443,17 +2443,20 @@ static int ath6kl_wmi_sync_point(struct wmi *wmi, u8 if_idx)
ath6kl_wmi_data_sync_send(wmi, data_sync_bufs[index].skb,
ep_id, if_idx);

if (ret)
break;

data_sync_bufs[index].skb = NULL;

if (ret)
goto free_data_skb;
}

free_skb:
return 0;

free_cmd_skb:
/* free up any resources left over (possibly due to an error) */
if (skb)
dev_kfree_skb(skb);

free_data_skb:
for (index = 0; index < num_pri_streams; index++) {
if (data_sync_bufs[index].skb != NULL) {
dev_kfree_skb((struct sk_buff *)data_sync_bufs[index].
Expand Down

0 comments on commit 0616dc1

Please sign in to comment.