* [PATCH] drm/amd/display: Fix a potential NULL dereference
@ 2021-01-25 8:45 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2021-01-25 8:45 UTC (permalink / raw)
To: Harry Wentland, George Shen
Cc: kernel-janitors, Anson Jacob, Yongqiang Sun, Jaehyun Chung,
Leo Li, Wenjing Liu, Rodrigo Siqueira, Bhawanpreet Lakha,
Nicholas Kazlauskas, Melissa Wen, David Airlie, Aurabindo Pillai,
amd-gfx, Daniel Vetter, Wyatt Wood, Alex Deucher, Anthony Koo,
Christian König
The debug printk dereferences "link->link_enc" before we have ensured
that it is non-NULL. Fix this potential NULL derefence by moving the
printk after the check.
Fixes: 1975b95ad4e7 ("drm/amd/display: Log link/connector info provided in BIOS object table")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/gpu/drm/amd/display/dc/core/dc_link.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
index c16af3983fdb..4d31b2fae1f9 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -1525,13 +1525,13 @@ static bool dc_link_construct(struct dc_link *link,
link->link_enc =
link->dc->res_pool->funcs->link_enc_create(&enc_init_data);
- DC_LOG_DC("BIOS object table - DP_IS_USB_C: %d", link->link_enc->features.flags.bits.DP_IS_USB_C);
-
if (!link->link_enc) {
DC_ERROR("Failed to create link encoder!\n");
goto link_enc_create_fail;
}
+ DC_LOG_DC("BIOS object table - DP_IS_USB_C: %d", link->link_enc->features.flags.bits.DP_IS_USB_C);
+
link->link_enc_hw_inst = link->link_enc->transmitter;
for (i = 0; i < 4; i++) {
--
2.29.2
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] drm/amd/display: Fix a potential NULL dereference
@ 2021-01-25 8:45 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2021-01-25 8:45 UTC (permalink / raw)
To: Harry Wentland, George Shen
Cc: kernel-janitors, Anson Jacob, Yongqiang Sun, Jaehyun Chung,
Leo Li, Wenjing Liu, Rodrigo Siqueira, Bhawanpreet Lakha,
Nicholas Kazlauskas, Melissa Wen, David Airlie, Aurabindo Pillai,
amd-gfx, Daniel Vetter, Wyatt Wood, Alex Deucher, Anthony Koo,
Christian König
The debug printk dereferences "link->link_enc" before we have ensured
that it is non-NULL. Fix this potential NULL derefence by moving the
printk after the check.
Fixes: 1975b95ad4e7 ("drm/amd/display: Log link/connector info provided in BIOS object table")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/gpu/drm/amd/display/dc/core/dc_link.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
index c16af3983fdb..4d31b2fae1f9 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -1525,13 +1525,13 @@ static bool dc_link_construct(struct dc_link *link,
link->link_enc link->dc->res_pool->funcs->link_enc_create(&enc_init_data);
- DC_LOG_DC("BIOS object table - DP_IS_USB_C: %d", link->link_enc->features.flags.bits.DP_IS_USB_C);
-
if (!link->link_enc) {
DC_ERROR("Failed to create link encoder!\n");
goto link_enc_create_fail;
}
+ DC_LOG_DC("BIOS object table - DP_IS_USB_C: %d", link->link_enc->features.flags.bits.DP_IS_USB_C);
+
link->link_enc_hw_inst = link->link_enc->transmitter;
for (i = 0; i < 4; i++) {
--
2.29.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] drm/amd/display: Fix a potential NULL dereference
2021-01-25 8:45 ` Dan Carpenter
@ 2021-01-25 15:45 ` Alex Deucher
-1 siblings, 0 replies; 4+ messages in thread
From: Alex Deucher @ 2021-01-25 15:45 UTC (permalink / raw)
To: Dan Carpenter
Cc: Melissa Wen, Daniel Vetter, Anson Jacob, Wenjing Liu,
David Airlie, Wyatt Wood, kernel-janitors, amd-gfx list,
Christian König, Bhawanpreet Lakha, Leo Li, Jaehyun Chung,
Aurabindo Pillai, Yongqiang Sun, George Shen, Alex Deucher,
Rodrigo Siqueira, Harry Wentland, Nicholas Kazlauskas,
Anthony Koo
On Mon, Jan 25, 2021 at 3:47 AM Dan Carpenter <dan.carpenter@oracle.com> wrote:
>
> The debug printk dereferences "link->link_enc" before we have ensured
> that it is non-NULL. Fix this potential NULL derefence by moving the
> printk after the check.
>
> Fixes: 1975b95ad4e7 ("drm/amd/display: Log link/connector info provided in BIOS object table")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied. Thanks!
Alex
> ---
> drivers/gpu/drm/amd/display/dc/core/dc_link.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
> index c16af3983fdb..4d31b2fae1f9 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
> @@ -1525,13 +1525,13 @@ static bool dc_link_construct(struct dc_link *link,
> link->link_enc =
> link->dc->res_pool->funcs->link_enc_create(&enc_init_data);
>
> - DC_LOG_DC("BIOS object table - DP_IS_USB_C: %d", link->link_enc->features.flags.bits.DP_IS_USB_C);
> -
> if (!link->link_enc) {
> DC_ERROR("Failed to create link encoder!\n");
> goto link_enc_create_fail;
> }
>
> + DC_LOG_DC("BIOS object table - DP_IS_USB_C: %d", link->link_enc->features.flags.bits.DP_IS_USB_C);
> +
> link->link_enc_hw_inst = link->link_enc->transmitter;
>
> for (i = 0; i < 4; i++) {
> --
> 2.29.2
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm/amd/display: Fix a potential NULL dereference
@ 2021-01-25 15:45 ` Alex Deucher
0 siblings, 0 replies; 4+ messages in thread
From: Alex Deucher @ 2021-01-25 15:45 UTC (permalink / raw)
To: Dan Carpenter
Cc: Melissa Wen, Daniel Vetter, Anson Jacob, Wenjing Liu,
David Airlie, Wyatt Wood, kernel-janitors, amd-gfx list,
Christian König, Bhawanpreet Lakha, Leo Li, Jaehyun Chung,
Aurabindo Pillai, Yongqiang Sun, George Shen, Alex Deucher,
Rodrigo Siqueira, Harry Wentland, Nicholas Kazlauskas,
Anthony Koo
On Mon, Jan 25, 2021 at 3:47 AM Dan Carpenter <dan.carpenter@oracle.com> wrote:
>
> The debug printk dereferences "link->link_enc" before we have ensured
> that it is non-NULL. Fix this potential NULL derefence by moving the
> printk after the check.
>
> Fixes: 1975b95ad4e7 ("drm/amd/display: Log link/connector info provided in BIOS object table")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied. Thanks!
Alex
> ---
> drivers/gpu/drm/amd/display/dc/core/dc_link.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
> index c16af3983fdb..4d31b2fae1f9 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
> @@ -1525,13 +1525,13 @@ static bool dc_link_construct(struct dc_link *link,
> link->link_enc > link->dc->res_pool->funcs->link_enc_create(&enc_init_data);
>
> - DC_LOG_DC("BIOS object table - DP_IS_USB_C: %d", link->link_enc->features.flags.bits.DP_IS_USB_C);
> -
> if (!link->link_enc) {
> DC_ERROR("Failed to create link encoder!\n");
> goto link_enc_create_fail;
> }
>
> + DC_LOG_DC("BIOS object table - DP_IS_USB_C: %d", link->link_enc->features.flags.bits.DP_IS_USB_C);
> +
> link->link_enc_hw_inst = link->link_enc->transmitter;
>
> for (i = 0; i < 4; i++) {
> --
> 2.29.2
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-01-25 15:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-25 8:45 [PATCH] drm/amd/display: Fix a potential NULL dereference Dan Carpenter
2021-01-25 8:45 ` Dan Carpenter
2021-01-25 15:45 ` Alex Deucher
2021-01-25 15:45 ` Alex Deucher
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.