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

Commit 75b34800 authored by Maharaja Kennadyrajan's avatar Maharaja Kennadyrajan Committed by Kalle Valo
Browse files

ath10k: hide kernel addresses from logs using %pK format specifier 



With the %pK format specifier we hide the kernel addresses
with the help of kptr_restrict sysctl.
In this patch, %p is changed to %pK in the driver code.

The sysctl is documented in Documentation/sysctl/kernel.txt.

Signed-off-by: default avatarMaharaja Kennadyrajan <c_mkenna@qti.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 64ed5771

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

+1 −1
Original line number Diff line number Diff line
@@ -577,7 +577,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%p mem_len: %lu gcc mem: 0x%p tcsr_mem: 0x%p\n",

	ath10k_dbg(ar, ATH10K_DBG_BOOT, "mem: 0x%pK mem_len: %lu gcc mem: 0x%pK tcsr_mem: 0x%pK\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

+2 −2
Original line number Diff line number Diff line
@@ -221,7 +221,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%p length %d\n",

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

		   buffer, length);



	if (ar->bmi.done_sent) {
@@ -287,7 +287,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%p length %d\n",

		   "bmi fast download address 0x%x buffer 0x%pK 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
@@ -840,7 +840,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 %p\n",

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

		   ce_id, nentries, src_ring->base_addr_owner_space);



	return 0;
@@ -874,7 +874,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 %p\n",

		   "boot ce dest ring id %d entries %d base_addr %pK\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
@@ -699,7 +699,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 %p otp_len %zd)!\n",

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

			    ar->running_fw->fw_file.otp_data,

			    ar->running_fw->fw_file.otp_len);

		return 0;
@@ -753,7 +753,7 @@ static int ath10k_download_fw(struct ath10k *ar) 
	}



	ath10k_dbg(ar, ATH10K_DBG_BOOT,

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

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

		   data, data_len);



	ret = ath10k_bmi_fast_download(ar, address, data, data_len);

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

+3 −3
Original line number Diff line number Diff line
@@ -44,7 +44,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 %p\n", __func__, skb);

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

	return skb;

}
@@ -62,7 +62,7 @@ static void ath10k_htc_notify_tx_completion(struct ath10k_htc_ep *ep, 
{

	struct ath10k *ar = ep->htc->ar;



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

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

		   ep->eid, skb);



	ath10k_htc_restore_tx_skb(ep->htc, skb);
@@ -404,7 +404,7 @@ void ath10k_htc_rx_completion_handler(struct ath10k *ar, struct sk_buff *skb) 
		goto out;

	}



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

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

		   eid, skb);

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