From: Michal Kubecek Date: Sat, 18 Jun 2011 18:34:01 +0000 (+0200) Subject: PM: Free memory bitmaps if opening /dev/snapshot fails X-Git-Tag: MMI-PSA29.97-13-9~19121^2~4 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8440f4b19494467883f8541b7aa28c7bbf6ac92b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git PM: Free memory bitmaps if opening /dev/snapshot fails 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 Signed-off-by: Rafael J. Wysocki Cc: stable@kernel.org --- diff --git a/kernel/power/user.c b/kernel/power/user.c index 7d02d33be699..42ddbc6f0de6 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;