[PATCH v1] PM: hibernate: Drop NULL pointer checks before acomp_request_free()

Posted by Rafael J. Wysocki 1 week, 4 days ago

From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Since acomp_request_free() checks its argument against NULL, the NULL
pointer checks before calling it added by commit ("7966cf0ebe32 PM:
hibernate: Fix crash when freeing invalid crypto compressor") are
redundant, so drop them.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
 kernel/power/swap.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -902,8 +902,8 @@ out_clean:
 		for (thr = 0; thr < nr_threads; thr++) {
 			if (data[thr].thr)
 				kthread_stop(data[thr].thr);
-			if (data[thr].cr)
-				acomp_request_free(data[thr].cr);
+
+			acomp_request_free(data[thr].cr);
 
 			if (!IS_ERR_OR_NULL(data[thr].cc))
 				crypto_free_acomp(data[thr].cc);
@@ -1502,8 +1502,8 @@ out_clean:
 		for (thr = 0; thr < nr_threads; thr++) {
 			if (data[thr].thr)
 				kthread_stop(data[thr].thr);
-			if (data[thr].cr)
-				acomp_request_free(data[thr].cr);
+
+			acomp_request_free(data[thr].cr);
 
 			if (!IS_ERR_OR_NULL(data[thr].cc))
 				crypto_free_acomp(data[thr].cc);

Re: [PATCH v1] PM: hibernate: Drop NULL pointer checks before acomp_request_free()

Posted by Malaya Kumar Rout 1 week, 3 days ago

On Tue, Jan 27, 2026 at 1:34 AM Rafael J. Wysocki <rafael@kernel.org> wrote:
>
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> Since acomp_request_free() checks its argument against NULL, the NULL
> pointer checks before calling it added by commit ("7966cf0ebe32 PM:
> hibernate: Fix crash when freeing invalid crypto compressor") are
> redundant, so drop them.
>
> No intentional functional impact.
>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
>  kernel/power/swap.c |    8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> --- a/kernel/power/swap.c
> +++ b/kernel/power/swap.c
> @@ -902,8 +902,8 @@ out_clean:
>                 for (thr = 0; thr < nr_threads; thr++) {
>                         if (data[thr].thr)
>                                 kthread_stop(data[thr].thr);
> -                       if (data[thr].cr)
> -                               acomp_request_free(data[thr].cr);
> +
> +                       acomp_request_free(data[thr].cr);
>
>                         if (!IS_ERR_OR_NULL(data[thr].cc))
>                                 crypto_free_acomp(data[thr].cc);
> @@ -1502,8 +1502,8 @@ out_clean:
>                 for (thr = 0; thr < nr_threads; thr++) {
>                         if (data[thr].thr)
>                                 kthread_stop(data[thr].thr);
> -                       if (data[thr].cr)
> -                               acomp_request_free(data[thr].cr);
> +
> +                       acomp_request_free(data[thr].cr);
>
>                         if (!IS_ERR_OR_NULL(data[thr].cc))
>                                 crypto_free_acomp(data[thr].cc);
>
>
>
Thanks, this makes sense to me. Dropping the redundant NULL checks
looks correct.