Skip to content

Commit b0dc512

Browse files
t-8chandersson
authored andcommitted
remoteproc: 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 ad67b74 ("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 locks 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 <[email protected]> Link: https://lore.kernel.org/r/20250611-restricted-pointers-remoteproc-v1-1-f059097ba663@linutronix.de Signed-off-by: Bjorn Andersson <[email protected]>
1 parent f926223 commit b0dc512

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

drivers/remoteproc/omap_remoteproc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1211,7 +1211,7 @@ static int omap_rproc_of_get_internal_memories(struct platform_device *pdev,
12111211
oproc->mem[i].dev_addr = data->mems[i].dev_addr;
12121212
oproc->mem[i].size = resource_size(res);
12131213

1214-
dev_dbg(dev, "memory %8s: bus addr %pa size 0x%x va %pK da 0x%x\n",
1214+
dev_dbg(dev, "memory %8s: bus addr %pa size 0x%x va %p da 0x%x\n",
12151215
data->mems[i].name, &oproc->mem[i].bus_addr,
12161216
oproc->mem[i].size, oproc->mem[i].cpu_addr,
12171217
oproc->mem[i].dev_addr);

drivers/remoteproc/pru_rproc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1055,7 +1055,7 @@ static int pru_rproc_probe(struct platform_device *pdev)
10551055
pru->mem_regions[i].pa = res->start;
10561056
pru->mem_regions[i].size = resource_size(res);
10571057

1058-
dev_dbg(dev, "memory %8s: pa %pa size 0x%zx va %pK\n",
1058+
dev_dbg(dev, "memory %8s: pa %pa size 0x%zx va %p\n",
10591059
mem_names[i], &pru->mem_regions[i].pa,
10601060
pru->mem_regions[i].size, pru->mem_regions[i].va);
10611061
}

drivers/remoteproc/remoteproc_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ static int rproc_alloc_carveout(struct rproc *rproc,
699699
return -ENOMEM;
700700
}
701701

702-
dev_dbg(dev, "carveout va %pK, dma %pad, len 0x%zx\n",
702+
dev_dbg(dev, "carveout va %p, dma %pad, len 0x%zx\n",
703703
va, &dma, mem->len);
704704

705705
if (mem->da != FW_RSC_ADDR_ANY && !rproc->domain) {

drivers/remoteproc/remoteproc_virtio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ static struct virtqueue *rp_find_vq(struct virtio_device *vdev,
136136
size = vring_size(num, rvring->align);
137137
memset(addr, 0, size);
138138

139-
dev_dbg(dev, "vring%d: va %pK qsz %d notifyid %d\n",
139+
dev_dbg(dev, "vring%d: va %p qsz %d notifyid %d\n",
140140
id, addr, num, rvring->notifyid);
141141

142142
/*

drivers/remoteproc/st_slim_rproc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ static void *slim_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *
190190
}
191191
}
192192

193-
dev_dbg(&rproc->dev, "da = 0x%llx len = 0x%zx va = 0x%pK\n",
193+
dev_dbg(&rproc->dev, "da = 0x%llx len = 0x%zx va = 0x%p\n",
194194
da, len, va);
195195

196196
return va;

drivers/remoteproc/ti_k3_common.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ int k3_rproc_of_get_memories(struct platform_device *pdev,
450450
kproc->mem[i].dev_addr = data->mems[i].dev_addr;
451451
kproc->mem[i].size = resource_size(res);
452452

453-
dev_dbg(dev, "memory %8s: bus addr %pa size 0x%zx va %pK da 0x%x\n",
453+
dev_dbg(dev, "memory %8s: bus addr %pa size 0x%zx va %p da 0x%x\n",
454454
data->mems[i].name, &kproc->mem[i].bus_addr,
455455
kproc->mem[i].size, kproc->mem[i].cpu_addr,
456456
kproc->mem[i].dev_addr);
@@ -528,7 +528,7 @@ int k3_reserved_mem_init(struct k3_rproc *kproc)
528528
return -ENOMEM;
529529
}
530530

531-
dev_dbg(dev, "reserved memory%d: bus addr %pa size 0x%zx va %pK da 0x%x\n",
531+
dev_dbg(dev, "reserved memory%d: bus addr %pa size 0x%zx va %p da 0x%x\n",
532532
i + 1, &kproc->rmem[i].bus_addr,
533533
kproc->rmem[i].size, kproc->rmem[i].cpu_addr,
534534
kproc->rmem[i].dev_addr);

drivers/remoteproc/ti_k3_r5_remoteproc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ static int k3_r5_core_of_get_sram_memories(struct platform_device *pdev,
10071007
return -ENOMEM;
10081008
}
10091009

1010-
dev_dbg(dev, "memory sram%d: bus addr %pa size 0x%zx va %pK da 0x%x\n",
1010+
dev_dbg(dev, "memory sram%d: bus addr %pa size 0x%zx va %p da 0x%x\n",
10111011
i, &core->sram[i].bus_addr,
10121012
core->sram[i].size, core->sram[i].cpu_addr,
10131013
core->sram[i].dev_addr);

drivers/rpmsg/virtio_rpmsg_bus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,7 @@ static int rpmsg_probe(struct virtio_device *vdev)
901901
goto vqs_del;
902902
}
903903

904-
dev_dbg(&vdev->dev, "buffers: va %pK, dma %pad\n",
904+
dev_dbg(&vdev->dev, "buffers: va %p, dma %pad\n",
905905
bufs_va, &vrp->bufs_dma);
906906

907907
/* half of the buffers is dedicated for RX */

0 commit comments

Comments
 (0)