Commit 81c5ffec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-6.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fix from Rafael Wysocki:
 "This fixes a crash in the hibernation image saving code that can be
  triggered when the given compression algorithm is unavailable (Malaya
  Kumar Rout)"

* tag 'pm-6.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM: hibernate: Fix crash when freeing invalid crypto compressor
parents a81668db 7966cf0e

kernel/power/swap.c

+10 −4
Original line number Diff line number Diff line
@@ -902,7 +902,10 @@ static int save_compressed_image(struct swap_map_handle *handle, 
		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);



			if (!IS_ERR_OR_NULL(data[thr].cc))

				crypto_free_acomp(data[thr].cc);

		}

		vfree(data);
@@ -1499,7 +1502,10 @@ static int load_compressed_image(struct swap_map_handle *handle, 
		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);



			if (!IS_ERR_OR_NULL(data[thr].cc))

				crypto_free_acomp(data[thr].cc);

		}

		vfree(data);