workqueue: Fix incorrect error return value in apply_workqueue_attrs_locked
Subsystems (2)
PATCH 1/1 workqueue: Fix incorrect error return value in apply_workqueue_attrs_locked
From: Ye Liu <[email protected]>
Commit 84193c07105c ("workqueue: Generalize unbound CPU pods") introduced a change that caused apply_workqueue_attrs_locked() to return error pointers using PTR_ERR() on failure instead of a negative error code. This caused unexpected behavior in functions that rely on the return value of apply_workqueue_attrs_locked, such as alloc_and_link_pwqs().
Specifically, alloc_and_link_pwqs() expects apply_workqueue_attrs_locked() to return 0 on success and a negative error code on failure. However, returning PTR_ERR(ctx) instead of -ENOMEM led to incorrect error handling in __alloc_workqueue, potentially causing system instability or crashes.
This patch ensures apply_workqueue_attrs_locked() returns a proper negative error code (-ENOMEM) in case of failure, restoring expected behavior.
--- kernel/workqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/workqueue.c +1 -1
@@ -5363,7 +5363,7 @@ static int apply_workqueue_attrs_locked(struct workqueue_struct *wq, ctx =apply_wqattrs_prepare (wq, attrs, wq_unbound_cpumask);if (IS_ERR (ctx)) -return PTR_ERR (ctx); +return -ENOMEM ;/* the ctx has been prepared successfully, let's commit it */ apply_wqattrs_commit (ctx);
Signature · 1 line
2.25.1
…
Quoted 1 line
This patch ensures …
Regards,
Markus
Quoted 4 lines · Markus Elfring
…
Quoted 1 line
This patch ensures …
Thanks for your feedback. I'll update the description accordingly and submit a revised patch. Do you have any other suggestions for this patch? Is it worth submitting?
Thanks,
Ye Liu
Quoted 2 lines
Regards,
Markus
On Mon, Mar 24, 2025 at 05:07:48PM +0800, Ye Liu wrote:
v> From: Ye Liu <[email protected]>
Quoted 4 lines
Commit
84193c07105c("workqueue: Generalize unbound CPU pods") introduced a change that causedapply_workqueue_attrs_locked()to return error pointers usingPTR_ERR()on failure instead of a negative error code.
PTR_ERR() does return negative error codes. Unless you pass it a NULL pointer, then it returns success. Or if you pass it a valid pointer it returns garbage.
Quoted 22 lines
This caused unexpected behavior in functions that rely on the return value of
apply_workqueue_attrs_locked, such asalloc_and_link_pwqs().Specifically,
alloc_and_link_pwqs()expectsapply_workqueue_attrs_locked()to return 0 on success and a negative error code on failure. However, returningPTR_ERR(ctx)instead of-ENOMEMled to incorrect error handling in__alloc_workqueue, potentially causing system instability or crashes.This patch ensures
apply_workqueue_attrs_locked()returns a proper negative error code (-ENOMEM) in case of failure, restoring expected behavior.Fixes 84193c07105c ("workqueue: Generalize unbound CPU pods")Signed-off-by Ye Liu <[email protected]>--- kernel/workqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kernel/workqueue.c +0
-0
kernel/workqueue.c static int apply_workqueue_attrs_locked(struct workqueue_struct *wq, · line 5367
Quoted 6 lines
kernel/workqueue.c +1
-1@@ -5363,7 +5363,7 @@ static int apply_workqueue_attrs_locked(struct workqueue_struct *wq, ctx =apply_wqattrs_prepare (wq, attrs, wq_unbound_cpumask);if (IS_ERR (ctx)) -return PTR_ERR (ctx); +return -ENOMEM ;
The original code was correct and the patch is wrong.
regards,
dan carpenter
Quoted 8 lines · Dan Carpenter
On Mon, Mar 24, 2025 at 05:07:48PM +0800, Ye Liu wrote:
v> From: Ye Liu <[email protected]>Quoted 3 lines
Commit
84193c07105c("workqueue: Generalize unbound CPU pods") introduced a change that causedapply_workqueue_attrs_locked()to return error pointers usingPTR_ERR()on failure instead of a negative error code.
PTR_ERR()does return negative error codes. Unless you pass it a NULL pointer, then it returns success. Or if you pass it a valid pointer it returns garbage.
I misunderstood PTR_ERR(). Thanks for pointing it out.
Quoted 23 lines
Quoted 23 lines
This caused unexpected behavior in functions that rely on the return value of
apply_workqueue_attrs_locked, such asalloc_and_link_pwqs().Specifically,
alloc_and_link_pwqs()expectsapply_workqueue_attrs_locked()to return 0 on success and a negative error code on failure. However, returningPTR_ERR(ctx)instead of-ENOMEMled to incorrect error handling in__alloc_workqueue, potentially causing system instability or crashes.This patch ensures
apply_workqueue_attrs_locked()returns a proper negative error code (-ENOMEM) in case of failure, restoring expected behavior.Fixes 84193c07105c ("workqueue: Generalize unbound CPU pods")Signed-off-by Ye Liu <[email protected]>--- kernel/workqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kernel/workqueue.c +0
-0@@ -5363,7 +5363,7 @@ static int apply_workqueue_attrs_locked(struct workqueue_struct *wq,
Quoted 6 lines
kernel/workqueue.c static int apply_workqueue_attrs_locked(struct workqueue_struct *wq, · line 5367
Quoted 5 lines
kernel/workqueue.c +1
-1ctx =apply_wqattrs_prepare (wq, attrs, wq_unbound_cpumask);if (IS_ERR (ctx)) -return PTR_ERR (ctx); +return -ENOMEM ;The original code was correct and the patch is wrong.
Drop it.
Quoted 3 lines
regards,
dan carpenter
Thanks,
Ye Liu