diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2011-01-07 01:42:31 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-07 06:26:45 +0100 |
| commit | 26fcaf60fe3861409eb4c455c5c0d0f00f599b08 (patch) | |
| tree | 43b0b91df3a1c8d136b63ce499001a05c9a02c93 /kernel/power | |
| parent | Linux 2.6.37 (diff) | |
| download | linux-26fcaf60fe3861409eb4c455c5c0d0f00f599b08.tar.xz linux-26fcaf60fe3861409eb4c455c5c0d0f00f599b08.zip | |
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: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'kernel/power')
| -rw-r--r-- | kernel/power/nvs.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/kernel/power/nvs.c b/kernel/power/nvs.c index 1836db60bbb6..57c6fabbb6b6 100644 --- a/kernel/power/nvs.c +++ b/kernel/power/nvs.c @@ -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; } /** |