Skip to contentSkip to conversation

drm/amd/display: No need for Null pointer check before kfree

PATCH In review Deepak R Varma 2 participants 3 messages Dec 27, 2022 – Jan 10, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amd/display: No need for Null pointer check before kfree

kfree() & vfree() internally performs NULL check on the pointer handed to it and take no action if it indeed is NULL. Hence there is no need for a pre-check of the memory pointer before handing it to kfree()/vfree().

Issue reported by ifnullfree.cocci Coccinelle semantic patch script.

---
 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 3 +--
 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c +1 -2
index 3ce0ee0d012f..694a9d3d92ae 100644
@@ -577,8 +577,7 @@ void dcn3_clk_mgr_construct(
 
 void dcn3_clk_mgr_destroy(struct clk_mgr_internal *clk_mgr)
 {
-	if (clk_mgr->base.bw_params)
-		kfree(clk_mgr->base.bw_params);
+	kfree(clk_mgr->base.bw_params);
 
 	if (clk_mgr->wm_range_table)
 		dm_helpers_free_gpu_mem(clk_mgr->base.ctx, DC_MEM_ALLOC_TYPE_GART,
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c +1 -2
index 200fcec19186..ba9814f88f48 100644
@@ -783,8 +783,7 @@ void dcn32_clk_mgr_construct(
 
 void dcn32_clk_mgr_destroy(struct clk_mgr_internal *clk_mgr)
 {
-	if (clk_mgr->base.bw_params)
-		kfree(clk_mgr->base.bw_params);
+	kfree(clk_mgr->base.bw_params);
 
 	if (clk_mgr->wm_range_table)
 		dm_helpers_free_gpu_mem(clk_mgr->base.ctx, DC_MEM_ALLOC_TYPE_GART,

--
2.34.1

#1 lore raw
Quoted 9 lines · Deepak R Varma

kfree() & vfree() internally performs NULL check on the pointer handed to it and take no action if it indeed is NULL. Hence there is no need for a pre-check of the memory pointer before handing it to kfree()/vfree().

Issue reported by ifnullfree.cocci Coccinelle semantic patch script.

---

Hello,
Requesting a review and feedback on this patch proposal.

Thank you,
./drv

Reviewed-by on v1 1/1
#2 lore raw
In reply to Deepak R Varma
Quoted 42 lines · Deepak R Varma

kfree() & vfree() internally performs NULL check on the pointer handed to it and take no action if it indeed is NULL. Hence there is no need for a pre-check of the memory pointer before handing it to kfree()/vfree().

Issue reported by ifnullfree.cocci Coccinelle semantic patch script.

---
  drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 3 +--
  drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 3 +--
  2 files changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c +1 -2
index 3ce0ee0d012f..694a9d3d92ae 100644
@@ -577,8 +577,7 @@ void dcn3_clk_mgr_construct(
 
  void dcn3_clk_mgr_destroy(struct clk_mgr_internal *clk_mgr)
  {
-	if (clk_mgr->base.bw_params)
-		kfree(clk_mgr->base.bw_params);
+	kfree(clk_mgr->base.bw_params);
 
  	if (clk_mgr->wm_range_table)
  		dm_helpers_free_gpu_mem(clk_mgr->base.ctx, DC_MEM_ALLOC_TYPE_GART,
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c +1 -3
index 200fcec19186..ba9814f88f48 100644
@@ -783,8 +783,7 @@ void dcn32_clk_mgr_construct(
 
  void dcn32_clk_mgr_destroy(struct clk_mgr_internal *clk_mgr)
  {
-	if (clk_mgr->base.bw_params)
-		kfree(clk_mgr->base.bw_params);
+	kfree(clk_mgr->base.bw_params);
 
  	if (clk_mgr->wm_range_table)
  		dm_helpers_free_gpu_mem(clk_mgr->base.ctx, DC_MEM_ALLOC_TYPE_GART,
--
Quoted 4 lines

2.34.1

Hi,

And applied to amd-staging-drm-next.

Thanks
Siqueira