diff options
| author | Michal Kubecek <mkubecek@suse.cz> | 2011-06-18 20:34:01 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-13 05:31:24 +0200 |
| commit | 92e438c204e4ae51e706725b6c007591e62504f2 (patch) | |
| tree | 18e412ea35ce0f561b5c6c2b9af0b93b3e6c95bc | |
| parent | 20fea53565eb54fba2acd1820864002b6b26b669 (diff) | |
| download | kernel-common-92e438c204e4ae51e706725b6c007591e62504f2.tar.gz kernel-common-92e438c204e4ae51e706725b6c007591e62504f2.tar.bz2 kernel-common-92e438c204e4ae51e706725b6c007591e62504f2.zip | |
PM: Free memory bitmaps if opening /dev/snapshot fails
commit 8440f4b19494467883f8541b7aa28c7bbf6ac92b upstream.
When opening /dev/snapshot device, snapshot_open() creates memory
bitmaps which are freed in snapshot_release(). But if any of the
callbacks called by pm_notifier_call_chain() returns NOTIFY_BAD, open()
fails, snapshot_release() is never called and bitmaps are not freed.
Next attempt to open /dev/snapshot then triggers BUG_ON() check in
create_basic_memory_bitmaps(). This happens e.g. when vmwatchdog module
is active on s390x.
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | kernel/power/user.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/power/user.c b/kernel/power/user.c index b1353560e5f2..b15c3d70d3cc 100644 --- a/kernel/power/user.c +++ b/kernel/power/user.c @@ -113,8 +113,10 @@ static int snapshot_open(struct inode *inode, struct file *filp) if (error) pm_notifier_call_chain(PM_POST_RESTORE); } - if (error) + if (error) { + free_basic_memory_bitmaps(); atomic_inc(&snapshot_device_available); + } data->frozen = 0; data->ready = 0; data->platform_support = 0; |