Skip to contentSkip to conversation

workqueue: Remove unnecessary kfree(NULL)

PATCH In review [email protected] 2 participants 2 messages May 27, 2020

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

PATCH v4 1/1 workqueue: Remove unnecessary kfree(NULL)

From: Zhang Qiang <[email protected]>

The callback function "rcu_free_wq" could be called after memory was released for "wq->rescuer" already and assignment is empty. so remove unnecessary kfree(NULL).

Fixes def98c84b6cd ("workqueue: Fix spurious sanity check failures in destroy_workqueue()")
Fixes 8efe1223d73c ("workqueue: Fix missing kfree(rescuer) in destroy_workqueue()")

---
v1->v2->v3->v4:
Modify wrong submission information.

 kernel/workqueue.c | 1 -
 1 file changed, 1 deletion(-)
kernel/workqueue.c +0 -1
index 891ccad5f271..a2451cdcd503 100644
@@ -3491,7 +3491,6 @@ static void rcu_free_wq(struct rcu_head *rcu)
 	else
 		free_workqueue_attrs(wq->unbound_attrs);
 
-	kfree(wq->rescuer);
 	kfree(wq);
 }
 
Signature · 1 line
2.24.1
#1 lore raw

Re: [PATCH v4] workqueue: Remove unnecessary kfree() call in rcu_free_wq()

Quoted 3 lines

The callback function "rcu_free_wq" could be called after memory was released for "wq->rescuer" already and assignment is empty. so remove unnecessary kfree(NULL).

I have got the impression that also this wording approach contains weaknesses. How do you think about a wording variant like the following?

The data structure member “wq->rescuer” was reset to a null pointer in one if branch. It was passed to a call of the function “kfree” in the callback function “rcu_free_wq” (which was eventually executed). The function “kfree” does not perform more meaningful data processing for a passed null pointer (besides immediately returning from such a call). Thus delete this function call which became unnecessary with the referenced software update.

Quoted 1 line
Fixes def98c84b6cd ("workqueue: Fix spurious sanity check failures in destroy_workqueue()")

This change triggered another collateral evolution finally. Would you like to detect similarly questionable function calls by advanced source code analysis?

Quoted 1 line
Fixes 8efe1223d73c ("workqueue: Fix missing kfree(rescuer) in destroy_workqueue()")

Please delete this tag from the change description (because I find that it is not so relevant here.)

Quoted 2 lines

v1->v2->v3->v4:
Modify wrong submission information.

Will it be nicer to mention the adjustment of the commit message?

Regards,
Markus