* [PATCH][drm-next] drm/amd/display: fix a potential null pointer dereference
@ 2019-08-16 22:10 ` Colin King
0 siblings, 0 replies; 10+ messages in thread
From: Colin King @ 2019-08-16 22:10 UTC (permalink / raw)
To: Harry Wentland, Leo Li, Alex Deucher, Christian König,
David Zhou, David Airlie, Daniel Vetter, amd-gfx, dri-devel
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
Currently the pointer init_data is dereferenced on the assignment
of fw_info before init_data is sanity checked to see if it is null.
Fix te potential null pointer dereference on init_data by only
performing dereference after it is null checked.
Addresses-Coverity: ("Dereference before null check")
Fixes: 9adc8050bf3c ("drm/amd/display: make firmware info only load once during dc_bios create")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c
index bee81bf288be..926954c804a6 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c
@@ -1235,7 +1235,7 @@ static bool calc_pll_max_vco_construct(
struct calc_pll_clock_source_init_data *init_data)
{
uint32_t i;
- struct dc_firmware_info *fw_info = &init_data->bp->fw_info;
+ struct dc_firmware_info *fw_info;
if (calc_pll_cs == NULL ||
init_data == NULL ||
init_data->bp == NULL)
@@ -1244,6 +1244,7 @@ static bool calc_pll_max_vco_construct(
if (init_data->bp->fw_info_valid)
return false;
+ fw_info = &init_data->bp->fw_info;
calc_pll_cs->ctx = init_data->ctx;
calc_pll_cs->ref_freq_khz = fw_info->pll_info.crystal_frequency;
calc_pll_cs->min_vco_khz =
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH][drm-next] drm/amd/display: fix a potential null pointer dereference @ 2019-08-16 22:10 ` Colin King 0 siblings, 0 replies; 10+ messages in thread From: Colin King @ 2019-08-16 22:10 UTC (permalink / raw) To: Harry Wentland, Leo Li, Alex Deucher, Christian König, David Zhou, David Airlie, Daniel Vetter, amd-gfx, dri-devel Cc: kernel-janitors, linux-kernel From: Colin Ian King <colin.king@canonical.com> Currently the pointer init_data is dereferenced on the assignment of fw_info before init_data is sanity checked to see if it is null. Fix te potential null pointer dereference on init_data by only performing dereference after it is null checked. Addresses-Coverity: ("Dereference before null check") Fixes: 9adc8050bf3c ("drm/amd/display: make firmware info only load once during dc_bios create") Signed-off-by: Colin Ian King <colin.king@canonical.com> --- drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c index bee81bf288be..926954c804a6 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c @@ -1235,7 +1235,7 @@ static bool calc_pll_max_vco_construct( struct calc_pll_clock_source_init_data *init_data) { uint32_t i; - struct dc_firmware_info *fw_info = &init_data->bp->fw_info; + struct dc_firmware_info *fw_info; if (calc_pll_cs = NULL || init_data = NULL || init_data->bp = NULL) @@ -1244,6 +1244,7 @@ static bool calc_pll_max_vco_construct( if (init_data->bp->fw_info_valid) return false; + fw_info = &init_data->bp->fw_info; calc_pll_cs->ctx = init_data->ctx; calc_pll_cs->ref_freq_khz = fw_info->pll_info.crystal_frequency; calc_pll_cs->min_vco_khz -- 2.20.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
[parent not found: <20190816221011.10750-1-colin.king-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>]
* Re: [PATCH][drm-next] drm/amd/display: fix a potential null pointer dereference [not found] ` <20190816221011.10750-1-colin.king-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org> 2019-08-17 6:51 ` Dan Carpenter @ 2019-08-17 6:51 ` Dan Carpenter 0 siblings, 0 replies; 10+ messages in thread From: Dan Carpenter @ 2019-08-17 6:51 UTC (permalink / raw) To: Colin King Cc: David Zhou, Leo Li, kernel-janitors-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, David Airlie, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Daniel Vetter, Alex Deucher, Harry Wentland, Christian König On Fri, Aug 16, 2019 at 11:10:11PM +0100, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Currently the pointer init_data is dereferenced on the assignment > of fw_info before init_data is sanity checked to see if it is null. > Fix te potential null pointer dereference on init_data by only > performing dereference after it is null checked. > > Addresses-Coverity: ("Dereference before null check") > Fixes: 9adc8050bf3c ("drm/amd/display: make firmware info only load once during dc_bios create") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c > index bee81bf288be..926954c804a6 100644 > --- a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c > +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c > @@ -1235,7 +1235,7 @@ static bool calc_pll_max_vco_construct( > struct calc_pll_clock_source_init_data *init_data) > { > uint32_t i; > - struct dc_firmware_info *fw_info = &init_data->bp->fw_info; > + struct dc_firmware_info *fw_info; > if (calc_pll_cs == NULL || > init_data == NULL || > init_data->bp == NULL) init_data can't be NULL. I'm mostly pointing this out because that NULL check is written so higgledy-piggledy. At first I thought this was staging code so I was planning to ignore the patch. :P regards, dan carpenter _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH][drm-next] drm/amd/display: fix a potential null pointer dereference @ 2019-08-17 6:51 ` Dan Carpenter 0 siblings, 0 replies; 10+ messages in thread From: Dan Carpenter @ 2019-08-17 6:51 UTC (permalink / raw) To: Colin King Cc: Harry Wentland, Leo Li, Alex Deucher, Christian König, David Zhou, David Airlie, Daniel Vetter, amd-gfx, dri-devel, kernel-janitors, linux-kernel On Fri, Aug 16, 2019 at 11:10:11PM +0100, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Currently the pointer init_data is dereferenced on the assignment > of fw_info before init_data is sanity checked to see if it is null. > Fix te potential null pointer dereference on init_data by only > performing dereference after it is null checked. > > Addresses-Coverity: ("Dereference before null check") > Fixes: 9adc8050bf3c ("drm/amd/display: make firmware info only load once during dc_bios create") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c > index bee81bf288be..926954c804a6 100644 > --- a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c > +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c > @@ -1235,7 +1235,7 @@ static bool calc_pll_max_vco_construct( > struct calc_pll_clock_source_init_data *init_data) > { > uint32_t i; > - struct dc_firmware_info *fw_info = &init_data->bp->fw_info; > + struct dc_firmware_info *fw_info; > if (calc_pll_cs == NULL || > init_data == NULL || > init_data->bp == NULL) init_data can't be NULL. I'm mostly pointing this out because that NULL check is written so higgledy-piggledy. At first I thought this was staging code so I was planning to ignore the patch. :P regards, dan carpenter ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH][drm-next] drm/amd/display: fix a potential null pointer dereference @ 2019-08-17 6:51 ` Dan Carpenter 0 siblings, 0 replies; 10+ messages in thread From: Dan Carpenter @ 2019-08-17 6:51 UTC (permalink / raw) To: Colin King Cc: David Zhou, Leo Li, kernel-janitors-u79uwXL29TY76Z2rM5mHXA, linux-kernel-u79uwXL29TY76Z2rM5mHXA, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, David Airlie, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Daniel Vetter, Alex Deucher, Harry Wentland, Christian König On Fri, Aug 16, 2019 at 11:10:11PM +0100, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Currently the pointer init_data is dereferenced on the assignment > of fw_info before init_data is sanity checked to see if it is null. > Fix te potential null pointer dereference on init_data by only > performing dereference after it is null checked. > > Addresses-Coverity: ("Dereference before null check") > Fixes: 9adc8050bf3c ("drm/amd/display: make firmware info only load once during dc_bios create") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c > index bee81bf288be..926954c804a6 100644 > --- a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c > +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c > @@ -1235,7 +1235,7 @@ static bool calc_pll_max_vco_construct( > struct calc_pll_clock_source_init_data *init_data) > { > uint32_t i; > - struct dc_firmware_info *fw_info = &init_data->bp->fw_info; > + struct dc_firmware_info *fw_info; > if (calc_pll_cs = NULL || > init_data = NULL || > init_data->bp = NULL) init_data can't be NULL. I'm mostly pointing this out because that NULL check is written so higgledy-piggledy. At first I thought this was staging code so I was planning to ignore the patch. :P regards, dan carpenter ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH][drm-next] drm/amd/display: fix a potential null pointer dereference 2019-08-16 22:10 ` Colin King (?) @ 2019-08-22 19:21 ` Harry Wentland -1 siblings, 0 replies; 10+ messages in thread From: Harry Wentland @ 2019-08-22 19:21 UTC (permalink / raw) To: Colin King, Wentland, Harry, Li, Sun peng (Leo), Deucher, Alexander, Koenig, Christian, Zhou, David(ChunMing), David Airlie, Daniel Vetter, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org On 2019-08-16 6:10 p.m., Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Currently the pointer init_data is dereferenced on the assignment > of fw_info before init_data is sanity checked to see if it is null. > Fix te potential null pointer dereference on init_data by only > performing dereference after it is null checked. > > Addresses-Coverity: ("Dereference before null check") > Fixes: 9adc8050bf3c ("drm/amd/display: make firmware info only load once during dc_bios create") > Signed-off-by: Colin Ian King <colin.king@canonical.com> Reviewed-by: Harry Wentland <harry.wentland@amd.com> Harry > --- > drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c > index bee81bf288be..926954c804a6 100644 > --- a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c > +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c > @@ -1235,7 +1235,7 @@ static bool calc_pll_max_vco_construct( > struct calc_pll_clock_source_init_data *init_data) > { > uint32_t i; > - struct dc_firmware_info *fw_info = &init_data->bp->fw_info; > + struct dc_firmware_info *fw_info; > if (calc_pll_cs == NULL || > init_data == NULL || > init_data->bp == NULL) > @@ -1244,6 +1244,7 @@ static bool calc_pll_max_vco_construct( > if (init_data->bp->fw_info_valid) > return false; > > + fw_info = &init_data->bp->fw_info; > calc_pll_cs->ctx = init_data->ctx; > calc_pll_cs->ref_freq_khz = fw_info->pll_info.crystal_frequency; > calc_pll_cs->min_vco_khz = > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH][drm-next] drm/amd/display: fix a potential null pointer dereference @ 2019-08-22 19:21 ` Harry Wentland 0 siblings, 0 replies; 10+ messages in thread From: Harry Wentland @ 2019-08-22 19:21 UTC (permalink / raw) To: Colin King, Wentland, Harry, Li, Sun peng (Leo), Deucher, Alexander, Koenig, Christian, Zhou, David(ChunMing), David Airlie, Daniel Vetter, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org On 2019-08-16 6:10 p.m., Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Currently the pointer init_data is dereferenced on the assignment > of fw_info before init_data is sanity checked to see if it is null. > Fix te potential null pointer dereference on init_data by only > performing dereference after it is null checked. > > Addresses-Coverity: ("Dereference before null check") > Fixes: 9adc8050bf3c ("drm/amd/display: make firmware info only load once during dc_bios create") > Signed-off-by: Colin Ian King <colin.king@canonical.com> Reviewed-by: Harry Wentland <harry.wentland@amd.com> Harry > --- > drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c > index bee81bf288be..926954c804a6 100644 > --- a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c > +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c > @@ -1235,7 +1235,7 @@ static bool calc_pll_max_vco_construct( > struct calc_pll_clock_source_init_data *init_data) > { > uint32_t i; > - struct dc_firmware_info *fw_info = &init_data->bp->fw_info; > + struct dc_firmware_info *fw_info; > if (calc_pll_cs == NULL || > init_data == NULL || > init_data->bp == NULL) > @@ -1244,6 +1244,7 @@ static bool calc_pll_max_vco_construct( > if (init_data->bp->fw_info_valid) > return false; > > + fw_info = &init_data->bp->fw_info; > calc_pll_cs->ctx = init_data->ctx; > calc_pll_cs->ref_freq_khz = fw_info->pll_info.crystal_frequency; > calc_pll_cs->min_vco_khz = > ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH][drm-next] drm/amd/display: fix a potential null pointer dereference @ 2019-08-22 19:21 ` Harry Wentland 0 siblings, 0 replies; 10+ messages in thread From: Harry Wentland @ 2019-08-22 19:21 UTC (permalink / raw) To: Colin King, Wentland, Harry, Li, Sun peng (Leo), Deucher, Alexander, Koenig, Christian, Zhou, David(ChunMing), David Airlie, Daniel Vetter, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org T24gMjAxOS0wOC0xNiA2OjEwIHAubS4sIENvbGluIEtpbmcgd3JvdGU6DQo+IEZyb206IENvbGlu IElhbiBLaW5nIDxjb2xpbi5raW5nQGNhbm9uaWNhbC5jb20+DQo+IA0KPiBDdXJyZW50bHkgdGhl IHBvaW50ZXIgaW5pdF9kYXRhIGlzIGRlcmVmZXJlbmNlZCBvbiB0aGUgYXNzaWdubWVudA0KPiBv ZiBmd19pbmZvIGJlZm9yZSBpbml0X2RhdGEgaXMgc2FuaXR5IGNoZWNrZWQgdG8gc2VlIGlmIGl0 IGlzIG51bGwuDQo+IEZpeCB0ZSBwb3RlbnRpYWwgbnVsbCBwb2ludGVyIGRlcmVmZXJlbmNlIG9u IGluaXRfZGF0YSBieSBvbmx5DQo+IHBlcmZvcm1pbmcgZGVyZWZlcmVuY2UgYWZ0ZXIgaXQgaXMg bnVsbCBjaGVja2VkLg0KPiANCj4gQWRkcmVzc2VzLUNvdmVyaXR5OiAoIkRlcmVmZXJlbmNlIGJl Zm9yZSBudWxsIGNoZWNrIikNCj4gRml4ZXM6IDlhZGM4MDUwYmYzYyAoImRybS9hbWQvZGlzcGxh eTogbWFrZSBmaXJtd2FyZSBpbmZvIG9ubHkgbG9hZCBvbmNlIGR1cmluZyBkY19iaW9zIGNyZWF0 ZSIpDQo+IFNpZ25lZC1vZmYtYnk6IENvbGluIElhbiBLaW5nIDxjb2xpbi5raW5nQGNhbm9uaWNh bC5jb20+DQoNClJldmlld2VkLWJ5OiBIYXJyeSBXZW50bGFuZCA8aGFycnkud2VudGxhbmRAYW1k LmNvbT4NCg0KSGFycnkNCg0KPiAtLS0NCj4gIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9k Yy9kY2UvZGNlX2Nsb2NrX3NvdXJjZS5jIHwgMyArKy0NCj4gIDEgZmlsZSBjaGFuZ2VkLCAyIGlu c2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkNCj4gDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlL2RjZV9jbG9ja19zb3VyY2UuYyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9kYy9kY2UvZGNlX2Nsb2NrX3NvdXJjZS5jDQo+IGluZGV4IGJlZTgx YmYyODhiZS4uOTI2OTU0YzgwNGE2IDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2Rpc3BsYXkvZGMvZGNlL2RjZV9jbG9ja19zb3VyY2UuYw0KPiArKysgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2Rpc3BsYXkvZGMvZGNlL2RjZV9jbG9ja19zb3VyY2UuYw0KPiBAQCAtMTIzNSw3ICsx MjM1LDcgQEAgc3RhdGljIGJvb2wgY2FsY19wbGxfbWF4X3Zjb19jb25zdHJ1Y3QoDQo+ICAJCQlz dHJ1Y3QgY2FsY19wbGxfY2xvY2tfc291cmNlX2luaXRfZGF0YSAqaW5pdF9kYXRhKQ0KPiAgew0K PiAgCXVpbnQzMl90IGk7DQo+IC0Jc3RydWN0IGRjX2Zpcm13YXJlX2luZm8gKmZ3X2luZm8gPSAm aW5pdF9kYXRhLT5icC0+ZndfaW5mbzsNCj4gKwlzdHJ1Y3QgZGNfZmlybXdhcmVfaW5mbyAqZndf aW5mbzsNCj4gIAlpZiAoY2FsY19wbGxfY3MgPT0gTlVMTCB8fA0KPiAgCQkJaW5pdF9kYXRhID09 IE5VTEwgfHwNCj4gIAkJCWluaXRfZGF0YS0+YnAgPT0gTlVMTCkNCj4gQEAgLTEyNDQsNiArMTI0 NCw3IEBAIHN0YXRpYyBib29sIGNhbGNfcGxsX21heF92Y29fY29uc3RydWN0KA0KPiAgCWlmIChp bml0X2RhdGEtPmJwLT5md19pbmZvX3ZhbGlkKQ0KPiAgCQlyZXR1cm4gZmFsc2U7DQo+ICANCj4g Kwlmd19pbmZvID0gJmluaXRfZGF0YS0+YnAtPmZ3X2luZm87DQo+ICAJY2FsY19wbGxfY3MtPmN0 eCA9IGluaXRfZGF0YS0+Y3R4Ow0KPiAgCWNhbGNfcGxsX2NzLT5yZWZfZnJlcV9raHogPSBmd19p bmZvLT5wbGxfaW5mby5jcnlzdGFsX2ZyZXF1ZW5jeTsNCj4gIAljYWxjX3BsbF9jcy0+bWluX3Zj b19raHogPQ0KPiANCg= ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH][drm-next] drm/amd/display: fix a potential null pointer dereference 2019-08-22 19:21 ` Harry Wentland @ 2019-08-22 20:55 ` Alex Deucher -1 siblings, 0 replies; 10+ messages in thread From: Alex Deucher @ 2019-08-22 20:55 UTC (permalink / raw) To: Harry Wentland Cc: Colin King, Wentland, Harry, Li, Sun peng (Leo), Deucher, Alexander, Koenig, Christian, Zhou, David(ChunMing), David Airlie, Daniel Vetter, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org On Thu, Aug 22, 2019 at 3:21 PM Harry Wentland <hwentlan@amd.com> wrote: > > On 2019-08-16 6:10 p.m., Colin King wrote: > > From: Colin Ian King <colin.king@canonical.com> > > > > Currently the pointer init_data is dereferenced on the assignment > > of fw_info before init_data is sanity checked to see if it is null. > > Fix te potential null pointer dereference on init_data by only > > performing dereference after it is null checked. > > > > Addresses-Coverity: ("Dereference before null check") > > Fixes: 9adc8050bf3c ("drm/amd/display: make firmware info only load once during dc_bios create") > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > > Reviewed-by: Harry Wentland <harry.wentland@amd.com> > Applied. Thanks! Alex > Harry > > > --- > > drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c > > index bee81bf288be..926954c804a6 100644 > > --- a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c > > +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c > > @@ -1235,7 +1235,7 @@ static bool calc_pll_max_vco_construct( > > struct calc_pll_clock_source_init_data *init_data) > > { > > uint32_t i; > > - struct dc_firmware_info *fw_info = &init_data->bp->fw_info; > > + struct dc_firmware_info *fw_info; > > if (calc_pll_cs == NULL || > > init_data == NULL || > > init_data->bp == NULL) > > @@ -1244,6 +1244,7 @@ static bool calc_pll_max_vco_construct( > > if (init_data->bp->fw_info_valid) > > return false; > > > > + fw_info = &init_data->bp->fw_info; > > calc_pll_cs->ctx = init_data->ctx; > > calc_pll_cs->ref_freq_khz = fw_info->pll_info.crystal_frequency; > > calc_pll_cs->min_vco_khz = > > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH][drm-next] drm/amd/display: fix a potential null pointer dereference @ 2019-08-22 20:55 ` Alex Deucher 0 siblings, 0 replies; 10+ messages in thread From: Alex Deucher @ 2019-08-22 20:55 UTC (permalink / raw) To: Harry Wentland Cc: Colin King, Wentland, Harry, Li, Sun peng (Leo), Deucher, Alexander, Koenig, Christian, Zhou, David(ChunMing), David Airlie, Daniel Vetter, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org On Thu, Aug 22, 2019 at 3:21 PM Harry Wentland <hwentlan@amd.com> wrote: > > On 2019-08-16 6:10 p.m., Colin King wrote: > > From: Colin Ian King <colin.king@canonical.com> > > > > Currently the pointer init_data is dereferenced on the assignment > > of fw_info before init_data is sanity checked to see if it is null. > > Fix te potential null pointer dereference on init_data by only > > performing dereference after it is null checked. > > > > Addresses-Coverity: ("Dereference before null check") > > Fixes: 9adc8050bf3c ("drm/amd/display: make firmware info only load once during dc_bios create") > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > > Reviewed-by: Harry Wentland <harry.wentland@amd.com> > Applied. Thanks! Alex > Harry > > > --- > > drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c > > index bee81bf288be..926954c804a6 100644 > > --- a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c > > +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c > > @@ -1235,7 +1235,7 @@ static bool calc_pll_max_vco_construct( > > struct calc_pll_clock_source_init_data *init_data) > > { > > uint32_t i; > > - struct dc_firmware_info *fw_info = &init_data->bp->fw_info; > > + struct dc_firmware_info *fw_info; > > if (calc_pll_cs = NULL || > > init_data = NULL || > > init_data->bp = NULL) > > @@ -1244,6 +1244,7 @@ static bool calc_pll_max_vco_construct( > > if (init_data->bp->fw_info_valid) > > return false; > > > > + fw_info = &init_data->bp->fw_info; > > calc_pll_cs->ctx = init_data->ctx; > > calc_pll_cs->ref_freq_khz = fw_info->pll_info.crystal_frequency; > > calc_pll_cs->min_vco_khz > > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2019-08-22 20:55 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-16 22:10 [PATCH][drm-next] drm/amd/display: fix a potential null pointer dereference Colin King
2019-08-16 22:10 ` Colin King
[not found] ` <20190816221011.10750-1-colin.king-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
2019-08-17 6:51 ` Dan Carpenter
2019-08-17 6:51 ` Dan Carpenter
2019-08-17 6:51 ` Dan Carpenter
2019-08-22 19:21 ` Harry Wentland
2019-08-22 19:21 ` Harry Wentland
2019-08-22 19:21 ` Harry Wentland
2019-08-22 20:55 ` Alex Deucher
2019-08-22 20:55 ` 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.