Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp1895683pxb; Wed, 9 Feb 2022 06:52:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJzj5p3mpl/5t4ZPIFrH9BzPOUU0TXVrSSCOQyZC33wHzWn+9iXYSco6ItVQXESgCDUjFMsL X-Received: by 2002:a17:906:974c:: with SMTP id o12mr2325802ejy.340.1644418342198; Wed, 09 Feb 2022 06:52:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644418342; cv=none; d=google.com; s=arc-20160816; b=0z7tFa3fq69Vzgmksmf2tnbd3vHJEtroI2kL1s7ilHvFR736Abbw4pu/BFGleS13KX ZGllmvzg/ecD3QUyC7u3IO3w2/Qy8Pt3iX2gv+KTnqT8KZPuKMPd+EDeQPJVnBy2O2M8 +/4373TtRBiIpOOTM8y3cDBt7VhFuMg2f24HnfqC3QS8/F/LytUee1/2fcNRQyBiu2Nd 1awWqxKxdhCBPBvbmUxh038rIKTzdAxPE1zGtCvYWxe5aphgslErOIdAWf31+ynCK/P3 4LiFrhsbo6JEiKmETTk4gl8vUz7WotF4wEfLAlxCigabfxNBe0Gd121eQydFdNvS+dTc H3Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=WUGOyOIgakmfAALjwT8TVhuO+lCAG0mABakLKe4Adcs=; b=0KsoyTydE63tX69HaqGBqSPMHNk8Q1ePAz3a9GbUTEK20OPzF7gdZVSk9Xzwqcahg/ KuozmhJ4UCTJr8kIPD9b2GgBiwxCNX06ZUd4qotI9Fj6VnmbqT4asRXpeA6gXThAdmMF K2wd92QEa2i4Otbre/zoqcHFDaUJ+CC7MCPkhh75kptyJ6reVz4j3TPHkDrxQqvar0p/ KILo5Ps8PXrDYp9Bfu3yvJlpfLhb90uTWoAU8ddZm2leyjOvs7dP9bAxed8SxVEnP+WH K6iaHkOJWUY1J5Bvn9a1amXLS3rrMNotmIOvFbbEQgeWEzTtlGFB+N5ZJWl5gribevli RXhQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n7si11321073ejl.74.2022.02.09.06.51.55; Wed, 09 Feb 2022 06:52:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232518AbiBIMIl (ORCPT + 99 others); Wed, 9 Feb 2022 07:08:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232042AbiBIMEw (ORCPT ); Wed, 9 Feb 2022 07:04:52 -0500 X-Greylist: delayed 1121 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Wed, 09 Feb 2022 03:32:37 PST Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CA3DDF28A7F for ; Wed, 9 Feb 2022 03:32:37 -0800 (PST) Received: from canpemm500010.china.huawei.com (unknown [172.30.72.54]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4Jtxxt2gk5zdZWL; Wed, 9 Feb 2022 19:10:42 +0800 (CST) Received: from huawei.com (10.175.127.227) by canpemm500010.china.huawei.com (7.192.105.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Wed, 9 Feb 2022 19:13:53 +0800 From: Ye Bin To: , , , CC: , , , Ye Bin Subject: [PATCH -next] PM:hibernate:fix miss close 'hib_resume_bdev' in load_image_and_restore Date: Wed, 9 Feb 2022 19:29:51 +0800 Message-ID: <20220209112951.3073370-1-yebin10@huawei.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To canpemm500010.china.huawei.com (7.192.105.118) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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); -- 2.31.1