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

Commit fa1b77ba authored by Michal Kazior's avatar Michal Kazior Committed by Sasha Levin
Browse files

ath10k: fix dma_mapping_error() handling 



[ Upstream commit 5e55e3cbd1042cffa6249f22c10585e63f8a29bf ]

The function returns 1 when DMA mapping fails. The
driver would return bogus values and could
possibly confuse itself if DMA failed.

Fixes: 767d34fc ("ath10k: remove DMA mapping wrappers")
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 089699ed

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

+3 −1
Original line number Diff line number Diff line
@@ -162,8 +162,10 @@ int ath10k_htc_send(struct ath10k_htc *htc, 


	skb_cb->paddr = dma_map_single(dev, skb->data, skb->len, DMA_TO_DEVICE);

	ret = dma_mapping_error(dev, skb_cb->paddr);

	if (ret)

	if (ret) {

		ret = -EIO;

		goto err_credits;

	}



	sg_item.transfer_id = ep->eid;

	sg_item.transfer_context = skb;

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

+6 −2
Original line number Diff line number Diff line
@@ -402,8 +402,10 @@ int ath10k_htt_mgmt_tx(struct ath10k_htt *htt, struct sk_buff *msdu) 
	skb_cb->paddr = dma_map_single(dev, msdu->data, msdu->len,

				       DMA_TO_DEVICE);

	res = dma_mapping_error(dev, skb_cb->paddr);

	if (res)

	if (res) {

		res = -EIO;

		goto err_free_txdesc;

	}



	skb_put(txdesc, len);

	cmd = (struct htt_cmd *)txdesc->data;
@@ -488,8 +490,10 @@ int ath10k_htt_tx(struct ath10k_htt *htt, struct sk_buff *msdu) 
	skb_cb->paddr = dma_map_single(dev, msdu->data, msdu->len,

				       DMA_TO_DEVICE);

	res = dma_mapping_error(dev, skb_cb->paddr);

	if (res)

	if (res) {

		res = -EIO;

		goto err_free_txbuf;

	}



	if (likely(use_frags)) {

		frags = skb_cb->htt.txbuf->frags;

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

+6 −2
Original line number Diff line number Diff line
@@ -1298,8 +1298,10 @@ static int ath10k_pci_hif_exchange_bmi_msg(struct ath10k *ar, 


	req_paddr = dma_map_single(ar->dev, treq, req_len, DMA_TO_DEVICE);

	ret = dma_mapping_error(ar->dev, req_paddr);

	if (ret)

	if (ret) {

		ret = -EIO;

		goto err_dma;

	}



	if (resp && resp_len) {

		tresp = kzalloc(*resp_len, GFP_KERNEL);
@@ -1311,8 +1313,10 @@ static int ath10k_pci_hif_exchange_bmi_msg(struct ath10k *ar, 
		resp_paddr = dma_map_single(ar->dev, tresp, *resp_len,

					    DMA_FROM_DEVICE);

		ret = dma_mapping_error(ar->dev, resp_paddr);

		if (ret)

		if (ret) {

			ret = EIO;

			goto err_req;

		}



		xfer.wait_for_resp = true;

		xfer.resp_len = 0;

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

+1 −0
Original line number Diff line number Diff line
@@ -1661,6 +1661,7 @@ static void ath10k_wmi_event_host_swba(struct ath10k *ar, struct sk_buff *skb) 
					ATH10K_SKB_CB(bcn)->paddr);

		if (ret) {

			ath10k_warn(ar, "failed to map beacon: %d\n", ret);

			ret = -EIO;

			dev_kfree_skb_any(bcn);

			goto skip;

		}