kernel/rcu/rcutorture.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Restructure error handling in rcu_torture_fwd_prog_init() to provide
cleaner allocation failure paths. The current code checks both
allocations
in a single condition, making error handling less efficient and clear.
The improved approach:
- Check rfp allocation immediately and return early on failure
- Separately handle fwd_prog_tasks allocation failure with proper
cleanup
- Remove redundant kfree(fwd_prog_tasks) since it would be NULL on
failure
Signed-off-by: Kaushlendra Kumar <kaushlendra.kumar@intel.com>
---
kernel/rcu/rcutorture.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
index 807fbf6123a7..6af0d207adba 100644
--- a/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@ -2995,11 +2995,11 @@ static int __init rcu_torture_fwd_prog_init(void)
if (fwd_progress_div <= 0)
fwd_progress_div = 4;
rfp = kcalloc(fwd_progress, sizeof(*rfp), GFP_KERNEL);
+ if (!rfp)
+ return -ENOMEM;
fwd_prog_tasks = kcalloc(fwd_progress, sizeof(*fwd_prog_tasks), GFP_KERNEL);
- if (!rfp || !fwd_prog_tasks) {
+ if (!fwd_prog_tasks) {
kfree(rfp);
- kfree(fwd_prog_tasks);
- fwd_prog_tasks = NULL;
fwd_progress = 0;
return -ENOMEM;
}
--
2.34.1
> Restructure error handling in rcu_torture_fwd_prog_init() to provide > cleaner allocation failure paths. The current code checks both > allocations > in a single condition, making error handling less efficient and clear. … I suggest to refine the word wrapping for such a change description. https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v6.17-rc5#n658 Regards, Markus
Hi Markus, On [Date], Markus Elfring <Markus.Elfring@web.de> wrote: > > Restructure error handling in rcu_torture_fwd_prog_init() to provide > > cleaner allocation failure paths. The current code checks both > > allocations in a single condition, making error handling less > > efficient and clear. > … > > I suggest to refine the word wrapping for such a change description. > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v6.17-rc5#n658 Thank you for the feedback on the word wrapping! I have sent a v2 patch with properly wrapped lines as suggested Best regards, Kaushlendra Kumar
© 2016 - 2025 Red Hat, Inc.