Commit 8add2b8d authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Jeff Johnson
Browse files

wifi: ath10k: Don't use %pK through printk 



In the past %pK was preferable to %p as it would not leak raw pointer
values into the kernel log.
Since commit ad67b74d ("printk: hash addresses printed with %p")
the regular %p has been improved to avoid this issue.
Furthermore, restricted pointers ("%pK") were never meant to be used
through printk(). They can still unintentionally leak raw pointers or
acquire sleeping looks in atomic contexts.

Switch to the regular pointer formatting which is safer and
easier to reason about.
There are still a few users of %pK left, but these use it through seq_file,
for which its usage is safe.

Signed-off-by: default avatarThomas Weißschuh <thomas.weissschuh@linutronix.de>
Reviewed-by: default avatarAleksandr Loktionov <aleksandr.loktionov@intel.com>
Link: https://patch.msgid.link/20250417-restricted-pointers-ath-v1-1-4e9a04dbe362@linutronix.de


Signed-off-by: default avatarJeff Johnson <jeff.johnson@oss.qualcomm.com>
parent 823435bd

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

+1 −1
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ static int ath10k_ahb_resource_init(struct ath10k *ar) 


	ath10k_dbg(ar, ATH10K_DBG_BOOT, "irq: %d\n", ar_ahb->irq);



	ath10k_dbg(ar, ATH10K_DBG_BOOT, "mem: 0x%pK mem_len: %lu gcc mem: 0x%pK tcsr_mem: 0x%pK\n",

	ath10k_dbg(ar, ATH10K_DBG_BOOT, "mem: 0x%p mem_len: %lu gcc mem: 0x%p tcsr_mem: 0x%p\n",

		   ar_ahb->mem, ar_ahb->mem_len,

		   ar_ahb->gcc_mem, ar_ahb->tcsr_mem);

	return 0;

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

+3 −3
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ static int ath10k_bmi_lz_data_large(struct ath10k *ar, const void *buffer, u32 l 
	int ret;

	size_t buf_len;



	ath10k_dbg(ar, ATH10K_DBG_BMI, "large bmi lz data buffer 0x%pK length %d\n",

	ath10k_dbg(ar, ATH10K_DBG_BMI, "large bmi lz data buffer 0x%p length %d\n",

		   buffer, length);



	if (ar->bmi.done_sent) {
@@ -395,7 +395,7 @@ int ath10k_bmi_lz_data(struct ath10k *ar, const void *buffer, u32 length) 
	u32 txlen;

	int ret;



	ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi lz data buffer 0x%pK length %d\n",

	ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi lz data buffer 0x%p length %d\n",

		   buffer, length);



	if (ar->bmi.done_sent) {
@@ -461,7 +461,7 @@ int ath10k_bmi_fast_download(struct ath10k *ar, 
	int ret;



	ath10k_dbg(ar, ATH10K_DBG_BMI,

		   "bmi fast download address 0x%x buffer 0x%pK length %d\n",

		   "bmi fast download address 0x%x buffer 0x%p length %d\n",

		   address, buffer, length);



	ret = ath10k_bmi_lz_stream_start(ar, address);

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

+2 −2
Original line number Diff line number Diff line
@@ -1388,7 +1388,7 @@ static int ath10k_ce_init_src_ring(struct ath10k *ar, 
	ath10k_ce_src_ring_highmark_set(ar, ctrl_addr, nentries);



	ath10k_dbg(ar, ATH10K_DBG_BOOT,

		   "boot init ce src ring id %d entries %d base_addr %pK\n",

		   "boot init ce src ring id %d entries %d base_addr %p\n",

		   ce_id, nentries, src_ring->base_addr_owner_space);



	return 0;
@@ -1426,7 +1426,7 @@ static int ath10k_ce_init_dest_ring(struct ath10k *ar, 
	ath10k_ce_dest_ring_highmark_set(ar, ctrl_addr, nentries);



	ath10k_dbg(ar, ATH10K_DBG_BOOT,

		   "boot ce dest ring id %d entries %d base_addr %pK\n",

		   "boot ce dest ring id %d entries %d base_addr %p\n",

		   ce_id, nentries, dest_ring->base_addr_owner_space);



	return 0;

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

+2 −2
Original line number Diff line number Diff line
@@ -1200,7 +1200,7 @@ static int ath10k_download_fw(struct ath10k *ar) 
	}



	ath10k_dbg(ar, ATH10K_DBG_BOOT,

		   "boot uploading firmware image %pK len %d\n",

		   "boot uploading firmware image %p len %d\n",

		   data, data_len);



	/* Check if device supports to download firmware via
@@ -1826,7 +1826,7 @@ static int ath10k_download_and_run_otp(struct ath10k *ar) 


	if (!ar->running_fw->fw_file.otp_data ||

	    !ar->running_fw->fw_file.otp_len) {

		ath10k_warn(ar, "Not running otp, calibration will be incorrect (otp-data %pK otp_len %zd)!\n",

		ath10k_warn(ar, "Not running otp, calibration will be incorrect (otp-data %p otp_len %zd)!\n",

			    ar->running_fw->fw_file.otp_data,

			    ar->running_fw->fw_file.otp_len);

		return 0;

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

+3 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static struct sk_buff *ath10k_htc_build_tx_ctrl_skb(void *ar) 
	skb_cb = ATH10K_SKB_CB(skb);

	memset(skb_cb, 0, sizeof(*skb_cb));



	ath10k_dbg(ar, ATH10K_DBG_HTC, "%s: skb %pK\n", __func__, skb);

	ath10k_dbg(ar, ATH10K_DBG_HTC, "%s: skb %p\n", __func__, skb);

	return skb;

}
@@ -54,7 +54,7 @@ void ath10k_htc_notify_tx_completion(struct ath10k_htc_ep *ep, 
	struct ath10k *ar = ep->htc->ar;

	struct ath10k_htc_hdr *hdr;



	ath10k_dbg(ar, ATH10K_DBG_HTC, "%s: ep %d skb %pK\n", __func__,

	ath10k_dbg(ar, ATH10K_DBG_HTC, "%s: ep %d skb %p\n", __func__,

		   ep->eid, skb);



	/* A corner case where the copy completion is reaching to host but still
@@ -515,7 +515,7 @@ void ath10k_htc_rx_completion_handler(struct ath10k *ar, struct sk_buff *skb) 
		/* zero length packet with trailer data, just drop these */

		goto out;



	ath10k_dbg(ar, ATH10K_DBG_HTC, "htc rx completion ep %d skb %pK\n",

	ath10k_dbg(ar, ATH10K_DBG_HTC, "htc rx completion ep %d skb %p\n",

		   eid, skb);

	ep->ep_ops.ep_rx_complete(ar, skb);