Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20220209112951.3073370-1-yebin10@huawei.com>
In-Reply-To: <20220209112951.3073370-1-yebin10@huawei.com>
From:   "Rafael J. Wysocki" <rafael@kernel.org>
Date:   Wed, 16 Feb 2022 19:48:58 +0100
Message-ID: <CAJZ5v0iMOJ-mHL6hUUWs+kuq=4C=_DGUM5b9=jHUp=qnEB2Gqg@mail.gmail.com>
Subject: Re: [PATCH -next] PM:hibernate:fix miss close 'hib_resume_bdev' in load_image_and_restore
To:     Ye Bin <yebin10@huawei.com>
Cc:     "Rafael J. Wysocki" <rafael@kernel.org>,
        Len Brown <len.brown@intel.com>, Pavel Machek <pavel@ucw.cz>,
        Linux PM <linux-pm@vger.kernel.org>,
        "Ted Ts'o" <tytso@mit.edu>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Jan Kara <jack@suse.cz>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Wed, Feb 9, 2022 at 12:13 PM Ye Bin <yebin10@huawei.com> wrote:
>
> As 'swsusp_check' open 'hib_resume_bdev', if call 'create_basic_memory_bitmaps'
> failed, we need to close 'hib_resume_bdev' in 'load_image_and_restore' function.
>
> Signed-off-by: Ye Bin <yebin10@huawei.com>
> ---
>  kernel/power/hibernate.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
> index e6af502c2fd7..49d1df0218cb 100644
> --- a/kernel/power/hibernate.c
> +++ b/kernel/power/hibernate.c
> @@ -689,8 +689,10 @@ static int load_image_and_restore(void)
>
>         lock_device_hotplug();
>         error = create_basic_memory_bitmaps();
> -       if (error)
> +       if (error) {
> +               swsusp_close(FMODE_READ | FMODE_EXCL);
>                 goto Unlock;
> +       }
>
>         error = swsusp_read(&flags);
>         swsusp_close(FMODE_READ | FMODE_EXCL);
> --

Applied as 5.18 material, thanks!