Commit cf036c41 authored by Kalle Valo's avatar Kalle Valo
Browse files

wifi: ath11k: don't use %pK 



According to Documentation/core-api/printk-formats.rst %pK should not be used
with printk(), so switch back to using just %p. printk() will hash the address
so addresses are not leaked to user space.

Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23

Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20230609142440.24643-14-kvalo@kernel.org
parent ac483942

drivers/net/wireless/ath/ath11k/dp_rx.c

+3 −3
Original line number Diff line number Diff line
@@ -2466,7 +2466,7 @@ static void ath11k_dp_rx_deliver_msdu(struct ath11k *ar, struct napi_struct *nap 
	spin_unlock_bh(&ar->ab->base_lock);



	ath11k_dbg(ar->ab, ATH11K_DBG_DATA,

		   "rx skb %pK len %u peer %pM %d %s sn %u %s%s%s%s%s%s%s %srate_idx %u vht_nss %u freq %u band %u flag 0x%x fcs-err %i mic-err %i amsdu-more %i\n",

		   "rx skb %p len %u peer %pM %d %s sn %u %s%s%s%s%s%s%s %srate_idx %u vht_nss %u freq %u band %u flag 0x%x fcs-err %i mic-err %i amsdu-more %i\n",

		   msdu,

		   msdu->len,

		   peer ? peer->addr : NULL,
@@ -4908,7 +4908,7 @@ ath11k_dp_rx_mon_merg_msdus(struct ath11k *ar, 
			goto err_merge_fail;



		ath11k_dbg(ab, ATH11K_DBG_DATA,

			   "mpdu_buf %pK mpdu_buf->len %u",

			   "mpdu_buf %p mpdu_buf->len %u",

			   prev_buf, prev_buf->len);

	} else {

		ath11k_dbg(ab, ATH11K_DBG_DATA,
@@ -5099,7 +5099,7 @@ static void ath11k_dp_rx_mon_dest_process(struct ath11k *ar, int mac_id, 


	if (!mon_dst_srng) {

		ath11k_warn(ar->ab,

			    "HAL Monitor Destination Ring Init Failed -- %pK",

			    "HAL Monitor Destination Ring Init Failed -- %p",

			    mon_dst_srng);

		return;

	}

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

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static struct sk_buff *ath11k_htc_build_tx_ctrl_skb(void *ab) 
	skb_cb = ATH11K_SKB_CB(skb);

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



	ath11k_dbg(ab, ATH11K_DBG_HTC, "%s: skb %pK\n", __func__, skb);

	ath11k_dbg(ab, ATH11K_DBG_HTC, "%s: skb %p\n", __func__, skb);

	return skb;

}
@@ -393,7 +393,7 @@ void ath11k_htc_rx_completion_handler(struct ath11k_base *ab, 
		goto out;

	}



	ath11k_dbg(ab, ATH11K_DBG_HTC, "rx completion ep %d skb %pK\n",

	ath11k_dbg(ab, ATH11K_DBG_HTC, "rx completion ep %d skb %p\n",

		   eid, skb);

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

drivers/net/wireless/ath/ath11k/mac.c

+5 −5
Original line number Diff line number Diff line
@@ -7144,7 +7144,7 @@ static int ath11k_mac_op_add_chanctx(struct ieee80211_hw *hw, 
	struct ath11k_base *ab = ar->ab;



	ath11k_dbg(ab, ATH11K_DBG_MAC,

		   "chanctx add freq %u width %d ptr %pK\n",

		   "chanctx add freq %u width %d ptr %p\n",

		   ctx->def.chan->center_freq, ctx->def.width, ctx);



	mutex_lock(&ar->conf_mutex);
@@ -7168,7 +7168,7 @@ static void ath11k_mac_op_remove_chanctx(struct ieee80211_hw *hw, 
	struct ath11k_base *ab = ar->ab;



	ath11k_dbg(ab, ATH11K_DBG_MAC,

		   "chanctx remove freq %u width %d ptr %pK\n",

		   "chanctx remove freq %u width %d ptr %p\n",

		   ctx->def.chan->center_freq, ctx->def.width, ctx);



	mutex_lock(&ar->conf_mutex);
@@ -7522,7 +7522,7 @@ static void ath11k_mac_op_change_chanctx(struct ieee80211_hw *hw, 
	mutex_lock(&ar->conf_mutex);



	ath11k_dbg(ab, ATH11K_DBG_MAC,

		   "chanctx change freq %u width %d ptr %pK changed %x\n",

		   "chanctx change freq %u width %d ptr %p changed %x\n",

		   ctx->def.chan->center_freq, ctx->def.width, ctx, changed);



	/* This shouldn't really happen because channel switching should use
@@ -7603,7 +7603,7 @@ ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw, 
	mutex_lock(&ar->conf_mutex);



	ath11k_dbg(ab, ATH11K_DBG_MAC,

		   "chanctx assign ptr %pK vdev_id %i\n",

		   "chanctx assign ptr %p vdev_id %i\n",

		   ctx, arvif->vdev_id);



	/* for QCA6390 bss peer must be created before vdev_start */
@@ -7693,7 +7693,7 @@ ath11k_mac_op_unassign_vif_chanctx(struct ieee80211_hw *hw, 
	mutex_lock(&ar->conf_mutex);



	ath11k_dbg(ab, ATH11K_DBG_MAC,

		   "chanctx unassign ptr %pK vdev_id %i\n",

		   "chanctx unassign ptr %p vdev_id %i\n",

		   ctx, arvif->vdev_id);



	WARN_ON(!arvif->is_started);

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

+1 −1
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ static int ath11k_pci_claim(struct ath11k_pci *ab_pci, struct pci_dev *pdev) 


	ab->mem_ce = ab->mem;



	ath11k_dbg(ab, ATH11K_DBG_BOOT, "pci_mem 0x%pK\n", ab->mem);

	ath11k_dbg(ab, ATH11K_DBG_BOOT, "pci_mem 0x%p\n", ab->mem);

	return 0;



release_region:

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

+2 −2
Original line number Diff line number Diff line
@@ -6439,7 +6439,7 @@ static int ath11k_wmi_tlv_rssi_chain_parse(struct ath11k_base *ab, 
	}



	ath11k_dbg(ab, ATH11K_DBG_WMI,

		   "stats bssid %pM vif %pK\n",

		   "stats bssid %pM vif %p\n",

		   arvif->bssid, arvif->vif);



	sta = ieee80211_find_sta_by_ifaddr(ar->hw,
@@ -7634,7 +7634,7 @@ static void ath11k_mgmt_rx_event(struct ath11k_base *ab, struct sk_buff *skb) 
		ath11k_mac_handle_beacon(ar, skb);



	ath11k_dbg(ab, ATH11K_DBG_MGMT,

		   "event mgmt rx skb %pK len %d ftype %02x stype %02x\n",

		   "event mgmt rx skb %p len %d ftype %02x stype %02x\n",

		   skb, skb->len,

		   fc & IEEE80211_FCTL_FTYPE, fc & IEEE80211_FCTL_STYPE);