| Message ID | 20250414-restricted-pointers-net-v1-5-12af0ce46cdd@linutronix.de (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | net: Don't use %pK through printk | expand |
> -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of > Thomas Weißschuh > Sent: Monday, April 14, 2025 10:26 AM > To: Jeff Johnson <jjohnson@kernel.org>; Loic Poulain > <loic.poulain@linaro.org>; Brian Norris <briannorris@chromium.org>; > Francesco Dolcini <francesco@dolcini.it>; Nguyen, Anthony L > <anthony.l.nguyen@intel.com>; Kitszel, Przemyslaw > <przemyslaw.kitszel@intel.com>; Andrew Lunn <andrew+netdev@lunn.ch>; > David S. Miller <davem@davemloft.net>; Dumazet, Eric > <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni > <pabeni@redhat.com>; Saeed Mahameed <saeedm@nvidia.com>; Leon > Romanovsky <leon@kernel.org>; Tariq Toukan <tariqt@nvidia.com> > Cc: ath10k@lists.infradead.org; linux-kernel@vger.kernel.org; > ath11k@lists.infradead.org; ath12k@lists.infradead.org; > wcn36xx@lists.infradead.org; linux-wireless@vger.kernel.org; intel-wired- > lan@lists.osuosl.org; netdev@vger.kernel.org; linux-rdma@vger.kernel.org; > Thomas Weißschuh <thomas.weissschuh@linutronix.de> > Subject: [Intel-wired-lan] [PATCH net-next 5/7] wifi: mwifiex: 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 ad67b74d2469 ("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: Thomas Weißschuh <thomas.weissschuh@linutronix.de> Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com> > --- > drivers/net/wireless/marvell/mwifiex/pcie.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c > b/drivers/net/wireless/marvell/mwifiex/pcie.c > index > dd2a42e732f2398892915e1a3ac88b7d3fb4ed3f..a760de191fce7340040b1 > bc74efb35cf52ce8368 100644 > --- a/drivers/net/wireless/marvell/mwifiex/pcie.c > +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c > @@ -2971,7 +2971,7 @@ static int mwifiex_init_pcie(struct mwifiex_adapter > *adapter) > goto err_iomap2; > } > > - pr_notice("PCI memory map Virt0: %pK PCI memory map Virt2: > %pK\n", > + pr_notice("PCI memory map Virt0: %p PCI memory map Virt2: %p\n", > card->pci_mmap, card->pci_mmap1); > > ret = mwifiex_pcie_alloc_buffers(adapter); > > -- > 2.49.0
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c index dd2a42e732f2398892915e1a3ac88b7d3fb4ed3f..a760de191fce7340040b1bc74efb35cf52ce8368 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie.c +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c @@ -2971,7 +2971,7 @@ static int mwifiex_init_pcie(struct mwifiex_adapter *adapter) goto err_iomap2; } - pr_notice("PCI memory map Virt0: %pK PCI memory map Virt2: %pK\n", + pr_notice("PCI memory map Virt0: %p PCI memory map Virt2: %p\n", card->pci_mmap, card->pci_mmap1); ret = mwifiex_pcie_alloc_buffers(adapter);
In the past %pK was preferable to %p as it would not leak raw pointer values into the kernel log. Since commit ad67b74d2469 ("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: Thomas Weißschuh <thomas.weissschuh@linutronix.de> --- drivers/net/wireless/marvell/mwifiex/pcie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)