Skip to content

Commit 6e6d3c6

Browse files
t-8chvinodkoul
authored andcommitted
dmaengine: stm32: 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. Signed-off-by: Thomas Weißschuh <[email protected]> Reviewed-by: Amelie Delaunay <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vinod Koul <[email protected]>
1 parent e19bdba commit 6e6d3c6

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

drivers/dma/stm32/stm32-dma.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ static void stm32_dma_start_transfer(struct stm32_dma_chan *chan)
613613
reg->dma_scr |= STM32_DMA_SCR_EN;
614614
stm32_dma_write(dmadev, STM32_DMA_SCR(chan->id), reg->dma_scr);
615615

616-
dev_dbg(chan2dev(chan), "vchan %pK: started\n", &chan->vchan);
616+
dev_dbg(chan2dev(chan), "vchan %p: started\n", &chan->vchan);
617617
}
618618

619619
static void stm32_dma_configure_next_sg(struct stm32_dma_chan *chan)
@@ -676,7 +676,7 @@ static void stm32_dma_handle_chan_paused(struct stm32_dma_chan *chan)
676676

677677
chan->status = DMA_PAUSED;
678678

679-
dev_dbg(chan2dev(chan), "vchan %pK: paused\n", &chan->vchan);
679+
dev_dbg(chan2dev(chan), "vchan %p: paused\n", &chan->vchan);
680680
}
681681

682682
static void stm32_dma_post_resume_reconfigure(struct stm32_dma_chan *chan)
@@ -728,7 +728,7 @@ static void stm32_dma_post_resume_reconfigure(struct stm32_dma_chan *chan)
728728
dma_scr |= STM32_DMA_SCR_EN;
729729
stm32_dma_write(dmadev, STM32_DMA_SCR(chan->id), dma_scr);
730730

731-
dev_dbg(chan2dev(chan), "vchan %pK: reconfigured after pause/resume\n", &chan->vchan);
731+
dev_dbg(chan2dev(chan), "vchan %p: reconfigured after pause/resume\n", &chan->vchan);
732732
}
733733

734734
static void stm32_dma_handle_chan_done(struct stm32_dma_chan *chan, u32 scr)
@@ -820,7 +820,7 @@ static void stm32_dma_issue_pending(struct dma_chan *c)
820820

821821
spin_lock_irqsave(&chan->vchan.lock, flags);
822822
if (vchan_issue_pending(&chan->vchan) && !chan->desc && !chan->busy) {
823-
dev_dbg(chan2dev(chan), "vchan %pK: issued\n", &chan->vchan);
823+
dev_dbg(chan2dev(chan), "vchan %p: issued\n", &chan->vchan);
824824
stm32_dma_start_transfer(chan);
825825

826826
}
@@ -922,7 +922,7 @@ static int stm32_dma_resume(struct dma_chan *c)
922922

923923
spin_unlock_irqrestore(&chan->vchan.lock, flags);
924924

925-
dev_dbg(chan2dev(chan), "vchan %pK: resumed\n", &chan->vchan);
925+
dev_dbg(chan2dev(chan), "vchan %p: resumed\n", &chan->vchan);
926926

927927
return 0;
928928
}

drivers/dma/stm32/stm32-dma3.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,7 @@ static void stm32_dma3_chan_start(struct stm32_dma3_chan *chan)
801801

802802
chan->dma_status = DMA_IN_PROGRESS;
803803

804-
dev_dbg(chan2dev(chan), "vchan %pK: started\n", &chan->vchan);
804+
dev_dbg(chan2dev(chan), "vchan %p: started\n", &chan->vchan);
805805
}
806806

807807
static int stm32_dma3_chan_suspend(struct stm32_dma3_chan *chan, bool susp)
@@ -1452,7 +1452,7 @@ static int stm32_dma3_pause(struct dma_chan *c)
14521452

14531453
chan->dma_status = DMA_PAUSED;
14541454

1455-
dev_dbg(chan2dev(chan), "vchan %pK: paused\n", &chan->vchan);
1455+
dev_dbg(chan2dev(chan), "vchan %p: paused\n", &chan->vchan);
14561456

14571457
return 0;
14581458
}
@@ -1465,7 +1465,7 @@ static int stm32_dma3_resume(struct dma_chan *c)
14651465

14661466
chan->dma_status = DMA_IN_PROGRESS;
14671467

1468-
dev_dbg(chan2dev(chan), "vchan %pK: resumed\n", &chan->vchan);
1468+
dev_dbg(chan2dev(chan), "vchan %p: resumed\n", &chan->vchan);
14691469

14701470
return 0;
14711471
}
@@ -1490,7 +1490,7 @@ static int stm32_dma3_terminate_all(struct dma_chan *c)
14901490
spin_unlock_irqrestore(&chan->vchan.lock, flags);
14911491
vchan_dma_desc_free_list(&chan->vchan, &head);
14921492

1493-
dev_dbg(chan2dev(chan), "vchan %pK: terminated\n", &chan->vchan);
1493+
dev_dbg(chan2dev(chan), "vchan %p: terminated\n", &chan->vchan);
14941494

14951495
return 0;
14961496
}
@@ -1543,7 +1543,7 @@ static void stm32_dma3_issue_pending(struct dma_chan *c)
15431543
spin_lock_irqsave(&chan->vchan.lock, flags);
15441544

15451545
if (vchan_issue_pending(&chan->vchan) && !chan->swdesc) {
1546-
dev_dbg(chan2dev(chan), "vchan %pK: issued\n", &chan->vchan);
1546+
dev_dbg(chan2dev(chan), "vchan %p: issued\n", &chan->vchan);
15471547
stm32_dma3_chan_start(chan);
15481548
}
15491549

drivers/dma/stm32/stm32-mdma.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,7 +1187,7 @@ static void stm32_mdma_start_transfer(struct stm32_mdma_chan *chan)
11871187

11881188
chan->busy = true;
11891189

1190-
dev_dbg(chan2dev(chan), "vchan %pK: started\n", &chan->vchan);
1190+
dev_dbg(chan2dev(chan), "vchan %p: started\n", &chan->vchan);
11911191
}
11921192

11931193
static void stm32_mdma_issue_pending(struct dma_chan *c)
@@ -1200,7 +1200,7 @@ static void stm32_mdma_issue_pending(struct dma_chan *c)
12001200
if (!vchan_issue_pending(&chan->vchan))
12011201
goto end;
12021202

1203-
dev_dbg(chan2dev(chan), "vchan %pK: issued\n", &chan->vchan);
1203+
dev_dbg(chan2dev(chan), "vchan %p: issued\n", &chan->vchan);
12041204

12051205
if (!chan->desc && !chan->busy)
12061206
stm32_mdma_start_transfer(chan);
@@ -1220,7 +1220,7 @@ static int stm32_mdma_pause(struct dma_chan *c)
12201220
spin_unlock_irqrestore(&chan->vchan.lock, flags);
12211221

12221222
if (!ret)
1223-
dev_dbg(chan2dev(chan), "vchan %pK: pause\n", &chan->vchan);
1223+
dev_dbg(chan2dev(chan), "vchan %p: pause\n", &chan->vchan);
12241224

12251225
return ret;
12261226
}
@@ -1261,7 +1261,7 @@ static int stm32_mdma_resume(struct dma_chan *c)
12611261

12621262
spin_unlock_irqrestore(&chan->vchan.lock, flags);
12631263

1264-
dev_dbg(chan2dev(chan), "vchan %pK: resume\n", &chan->vchan);
1264+
dev_dbg(chan2dev(chan), "vchan %p: resume\n", &chan->vchan);
12651265

12661266
return 0;
12671267
}

0 commit comments

Comments
 (0)