Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 469d479f authored by Michal Kazior's avatar Michal Kazior Committed by Kalle Valo
Browse files

ath10k: prevent memory leak in wmi rx ops 



Found during code review. This was pretty much
impossible to happen but better safe than sorry.

Signed-off-by: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 0e6eb417

drivers/net/wireless/ath/ath10k/wmi-tlv.c

+2 −1
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ static void ath10k_wmi_tlv_op_rx(struct ath10k *ar, struct sk_buff *skb) 
	id = MS(__le32_to_cpu(cmd_hdr->cmd_id), WMI_CMD_HDR_CMD_ID);



	if (skb_pull(skb, sizeof(struct wmi_cmd_hdr)) == NULL)

		return;

		goto out;



	trace_ath10k_wmi_event(ar, id, skb->data, skb->len);
@@ -521,6 +521,7 @@ static void ath10k_wmi_tlv_op_rx(struct ath10k *ar, struct sk_buff *skb) 
		break;

	}



out:

	dev_kfree_skb(skb);

}

drivers/net/wireless/ath/ath10k/wmi.c

+5 −3
Original line number Diff line number Diff line
@@ -3223,7 +3223,7 @@ static void ath10k_wmi_op_rx(struct ath10k *ar, struct sk_buff *skb) 
	id = MS(__le32_to_cpu(cmd_hdr->cmd_id), WMI_CMD_HDR_CMD_ID);



	if (skb_pull(skb, sizeof(struct wmi_cmd_hdr)) == NULL)

		return;

		goto out;



	trace_ath10k_wmi_event(ar, id, skb->data, skb->len);
@@ -3327,6 +3327,7 @@ static void ath10k_wmi_op_rx(struct ath10k *ar, struct sk_buff *skb) 
		break;

	}



out:

	dev_kfree_skb(skb);

}
@@ -3340,7 +3341,7 @@ static void ath10k_wmi_10_1_op_rx(struct ath10k *ar, struct sk_buff *skb) 
	id = MS(__le32_to_cpu(cmd_hdr->cmd_id), WMI_CMD_HDR_CMD_ID);



	if (skb_pull(skb, sizeof(struct wmi_cmd_hdr)) == NULL)

		return;

		goto out;



	trace_ath10k_wmi_event(ar, id, skb->data, skb->len);
@@ -3463,7 +3464,7 @@ static void ath10k_wmi_10_2_op_rx(struct ath10k *ar, struct sk_buff *skb) 
	id = MS(__le32_to_cpu(cmd_hdr->cmd_id), WMI_CMD_HDR_CMD_ID);



	if (skb_pull(skb, sizeof(struct wmi_cmd_hdr)) == NULL)

		return;

		goto out;



	trace_ath10k_wmi_event(ar, id, skb->data, skb->len);
@@ -3571,6 +3572,7 @@ static void ath10k_wmi_10_2_op_rx(struct ath10k *ar, struct sk_buff *skb) 
		break;

	}



out:

	dev_kfree_skb(skb);

}