Skip to content

Commit 18665ea

Browse files
t-8chdaeinki
t-8ch
authored and
daeinki
committed
drm/exynos: 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 <thomas.weissschuh@linutronix.de> Signed-off-by: Inki Dae <inki.dae@samsung.com>
1 parent 9fbceb3 commit 18665ea

2 files changed

Lines changed: 17 additions & 17 deletions

File tree

‎drivers/gpu/drm/exynos/exynos_drm_gem.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ static struct exynos_drm_gem *exynos_drm_gem_init(struct drm_device *dev,
174174
return ERR_PTR(ret);
175175
}
176176

177-
DRM_DEV_DEBUG_KMS(dev->dev, "created file object = %pK\n", obj->filp);
177+
DRM_DEV_DEBUG_KMS(dev->dev, "created file object = %p\n", obj->filp);
178178

179179
return exynos_gem;
180180
}

‎drivers/gpu/drm/exynos/exynos_drm_ipp.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ static inline struct exynos_drm_ipp_task *
271271
task->src.rect.h = task->dst.rect.h = UINT_MAX;
272272
task->transform.rotation = DRM_MODE_ROTATE_0;
273273

274-
DRM_DEV_DEBUG_DRIVER(task->dev, "Allocated task %pK\n", task);
274+
DRM_DEV_DEBUG_DRIVER(task->dev, "Allocated task %p\n", task);
275275

276276
return task;
277277
}
@@ -339,7 +339,7 @@ static int exynos_drm_ipp_task_set(struct exynos_drm_ipp_task *task,
339339
}
340340

341341
DRM_DEV_DEBUG_DRIVER(task->dev,
342-
"Got task %pK configuration from userspace\n",
342+
"Got task %p configuration from userspace\n",
343343
task);
344344
return 0;
345345
}
@@ -394,7 +394,7 @@ static void exynos_drm_ipp_task_release_buf(struct exynos_drm_ipp_buffer *buf)
394394
static void exynos_drm_ipp_task_free(struct exynos_drm_ipp *ipp,
395395
struct exynos_drm_ipp_task *task)
396396
{
397-
DRM_DEV_DEBUG_DRIVER(task->dev, "Freeing task %pK\n", task);
397+
DRM_DEV_DEBUG_DRIVER(task->dev, "Freeing task %p\n", task);
398398

399399
exynos_drm_ipp_task_release_buf(&task->src);
400400
exynos_drm_ipp_task_release_buf(&task->dst);
@@ -559,7 +559,7 @@ static int exynos_drm_ipp_check_format(struct exynos_drm_ipp_task *task,
559559
DRM_EXYNOS_IPP_FORMAT_DESTINATION);
560560
if (!fmt) {
561561
DRM_DEV_DEBUG_DRIVER(task->dev,
562-
"Task %pK: %s format not supported\n",
562+
"Task %p: %s format not supported\n",
563563
task, buf == src ? "src" : "dst");
564564
return -EINVAL;
565565
}
@@ -609,7 +609,7 @@ static int exynos_drm_ipp_task_check(struct exynos_drm_ipp_task *task)
609609
bool rotate = (rotation != DRM_MODE_ROTATE_0);
610610
bool scale = false;
611611

612-
DRM_DEV_DEBUG_DRIVER(task->dev, "Checking task %pK\n", task);
612+
DRM_DEV_DEBUG_DRIVER(task->dev, "Checking task %p\n", task);
613613

614614
if (src->rect.w == UINT_MAX)
615615
src->rect.w = src->buf.width;
@@ -625,7 +625,7 @@ static int exynos_drm_ipp_task_check(struct exynos_drm_ipp_task *task)
625625
dst->rect.x + dst->rect.w > (dst->buf.width) ||
626626
dst->rect.y + dst->rect.h > (dst->buf.height)) {
627627
DRM_DEV_DEBUG_DRIVER(task->dev,
628-
"Task %pK: defined area is outside provided buffers\n",
628+
"Task %p: defined area is outside provided buffers\n",
629629
task);
630630
return -EINVAL;
631631
}
@@ -642,7 +642,7 @@ static int exynos_drm_ipp_task_check(struct exynos_drm_ipp_task *task)
642642
(!(ipp->capabilities & DRM_EXYNOS_IPP_CAP_SCALE) && scale) ||
643643
(!(ipp->capabilities & DRM_EXYNOS_IPP_CAP_CONVERT) &&
644644
src->buf.fourcc != dst->buf.fourcc)) {
645-
DRM_DEV_DEBUG_DRIVER(task->dev, "Task %pK: hw capabilities exceeded\n",
645+
DRM_DEV_DEBUG_DRIVER(task->dev, "Task %p: hw capabilities exceeded\n",
646646
task);
647647
return -EINVAL;
648648
}
@@ -655,7 +655,7 @@ static int exynos_drm_ipp_task_check(struct exynos_drm_ipp_task *task)
655655
if (ret)
656656
return ret;
657657

658-
DRM_DEV_DEBUG_DRIVER(ipp->dev, "Task %pK: all checks done.\n",
658+
DRM_DEV_DEBUG_DRIVER(ipp->dev, "Task %p: all checks done.\n",
659659
task);
660660

661661
return ret;
@@ -667,25 +667,25 @@ static int exynos_drm_ipp_task_setup_buffers(struct exynos_drm_ipp_task *task,
667667
struct exynos_drm_ipp_buffer *src = &task->src, *dst = &task->dst;
668668
int ret = 0;
669669

670-
DRM_DEV_DEBUG_DRIVER(task->dev, "Setting buffer for task %pK\n",
670+
DRM_DEV_DEBUG_DRIVER(task->dev, "Setting buffer for task %p\n",
671671
task);
672672

673673
ret = exynos_drm_ipp_task_setup_buffer(src, filp);
674674
if (ret) {
675675
DRM_DEV_DEBUG_DRIVER(task->dev,
676-
"Task %pK: src buffer setup failed\n",
676+
"Task %p: src buffer setup failed\n",
677677
task);
678678
return ret;
679679
}
680680
ret = exynos_drm_ipp_task_setup_buffer(dst, filp);
681681
if (ret) {
682682
DRM_DEV_DEBUG_DRIVER(task->dev,
683-
"Task %pK: dst buffer setup failed\n",
683+
"Task %p: dst buffer setup failed\n",
684684
task);
685685
return ret;
686686
}
687687

688-
DRM_DEV_DEBUG_DRIVER(task->dev, "Task %pK: buffers prepared.\n",
688+
DRM_DEV_DEBUG_DRIVER(task->dev, "Task %p: buffers prepared.\n",
689689
task);
690690

691691
return ret;
@@ -764,7 +764,7 @@ void exynos_drm_ipp_task_done(struct exynos_drm_ipp_task *task, int ret)
764764
struct exynos_drm_ipp *ipp = task->ipp;
765765
unsigned long flags;
766766

767-
DRM_DEV_DEBUG_DRIVER(task->dev, "ipp: %d, task %pK done: %d\n",
767+
DRM_DEV_DEBUG_DRIVER(task->dev, "ipp: %d, task %p done: %d\n",
768768
ipp->id, task, ret);
769769

770770
spin_lock_irqsave(&ipp->lock, flags);
@@ -807,7 +807,7 @@ static void exynos_drm_ipp_next_task(struct exynos_drm_ipp *ipp)
807807
spin_unlock_irqrestore(&ipp->lock, flags);
808808

809809
DRM_DEV_DEBUG_DRIVER(ipp->dev,
810-
"ipp: %d, selected task %pK to run\n", ipp->id,
810+
"ipp: %d, selected task %p to run\n", ipp->id,
811811
task);
812812

813813
ret = ipp->funcs->commit(ipp, task);
@@ -917,14 +917,14 @@ int exynos_drm_ipp_commit_ioctl(struct drm_device *dev, void *data,
917917
*/
918918
if (arg->flags & DRM_EXYNOS_IPP_FLAG_NONBLOCK) {
919919
DRM_DEV_DEBUG_DRIVER(ipp->dev,
920-
"ipp: %d, nonblocking processing task %pK\n",
920+
"ipp: %d, nonblocking processing task %p\n",
921921
ipp->id, task);
922922

923923
task->flags |= DRM_EXYNOS_IPP_TASK_ASYNC;
924924
exynos_drm_ipp_schedule_task(task->ipp, task);
925925
ret = 0;
926926
} else {
927-
DRM_DEV_DEBUG_DRIVER(ipp->dev, "ipp: %d, processing task %pK\n",
927+
DRM_DEV_DEBUG_DRIVER(ipp->dev, "ipp: %d, processing task %p\n",
928928
ipp->id, task);
929929
exynos_drm_ipp_schedule_task(ipp, task);
930930
ret = wait_event_interruptible(ipp->done_wq,

0 commit comments

Comments
 (0)