Commit 26fcaf60 authored by Jiri Slaby's avatar Jiri Slaby Committed by Len Brown
Browse files

PM: Fix oops in suspend/hibernate code related to failing ioremap() 



When ioremap() fails (which might happen for some reason), we nicely
oops in suspend_nvs_save() due to NULL dereference by memcpy() in there.
Fail gracefully instead.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 3c0eee3f

drivers/acpi/sleep.c

+2 −3
Original line number Diff line number Diff line
@@ -124,8 +124,7 @@ static int acpi_pm_freeze(void) 
static int acpi_pm_pre_suspend(void)

{

	acpi_pm_freeze();

	suspend_nvs_save();

	return 0;

	return suspend_nvs_save();

}



/**
@@ -151,7 +150,7 @@ static int acpi_pm_prepare(void) 
{

	int error = __acpi_pm_prepare();

	if (!error)

		acpi_pm_pre_suspend();

		error = acpi_pm_pre_suspend();



	return error;

}

include/linux/suspend.h

+2 −2
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static inline bool system_entering_hibernation(void) { return false; } 
extern int suspend_nvs_register(unsigned long start, unsigned long size);

extern int suspend_nvs_alloc(void);

extern void suspend_nvs_free(void);

extern void suspend_nvs_save(void);

extern int suspend_nvs_save(void);

extern void suspend_nvs_restore(void);

#else /* CONFIG_SUSPEND_NVS */

static inline int suspend_nvs_register(unsigned long a, unsigned long b)
@@ -271,7 +271,7 @@ static inline int suspend_nvs_register(unsigned long a, unsigned long b) 
}

static inline int suspend_nvs_alloc(void) { return 0; }

static inline void suspend_nvs_free(void) {}

static inline void suspend_nvs_save(void) {}

static inline int suspend_nvs_save(void) {}

static inline void suspend_nvs_restore(void) {}

#endif /* CONFIG_SUSPEND_NVS */

kernel/power/nvs.c

+7 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ int suspend_nvs_alloc(void) 
/**

 *	suspend_nvs_save - save NVS memory regions

 */

void suspend_nvs_save(void)

int suspend_nvs_save(void)

{

	struct nvs_page *entry;
@@ -114,8 +114,14 @@ void suspend_nvs_save(void) 
	list_for_each_entry(entry, &nvs_list, node)

		if (entry->data) {

			entry->kaddr = ioremap(entry->phys_start, entry->size);

			if (!entry->kaddr) {

				suspend_nvs_free();

				return -ENOMEM;

			}

			memcpy(entry->data, entry->kaddr, entry->size);

		}



	return 0;

}



/**