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;
From:   Li Dong <lidong@vivo.com>
To:     Bob Peterson <rpeterso@redhat.com>,
        Andreas Gruenbacher <agruenba@redhat.com>,
        cluster-devel@redhat.com (open list:GFS2 FILE SYSTEM),
        linux-kernel@vger.kernel.org (open list)
Cc:     opensource.kernel@vivo.com, lidong@vivo.com
Subject: [PATCH] fs: Fix bug in gfs2_freeze_func that can cause deadlock
Date:   Tue, 20 Jun 2023 11:38:39 +0800
Message-Id: <20230620033859.997-1-lidong@vivo.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dVVQUFdLeWVrS1J2MlRrcEtDSFVOYnJaMFU5SnJ0ZjRaMWpudVhuQ01RUkM3?=
 =?utf-8?B?T1F2aEtWYzNORFVYVkJweHh2WTB3TFZxN1Z6SzdBMUVmc2pzY21GT2NZS1ZG?=
 =?utf-8?B?ZjNMdEtqZ2xaMUlDT3hmM1ZSRHFWSHpCZERsNU1jbmNKMTFTMHVnemhJZW1p?=
 =?utf-8?B?ZWppZElnODRCUUtpejRpZnNyL1V2T3VTRFBZQVptcnpxNjlLcjk4eUlwdWh5?=
 =?utf-8?B?TzBaTWpOY0gwa09ZVjdHejBrN3dZQzhZREJyRmlXZm5mekdpSVVNN0pOeFJF?=
 =?utf-8?B?WU8yYzY1amo2dEV3NTZHWU5uN3VJaE5ibWFDVytuRGc0V2Z2Nmd0ZXRTVGYw?=
 =?utf-8?B?cmdON2pTM2N6L0kxTzhQOFE1cDBEQkc3dUdBMElraUxYZjJDdWE1SW1RYm4v?=
 =?utf-8?B?aW1aU29DWDFmT3FaL0xvbUJ2S3paRjl3WnVxd2JzelF6NHlMZEpIMm5nVUVn?=
 =?utf-8?B?YlYxc0oxdXB6TzFzQ2gvdnFzcEZ3MzRlcU1ud1V6cFlycmhTVEd4SFBwUEln?=
 =?utf-8?B?R3NnZDFkTVVsdFFLMXNIRXRZSU5xcVlXL203QWVHM3RIa3hUcEJub3dsTnpy?=
 =?utf-8?B?c295amU1T2ozTVF6SnM4czlQdlRob1VIeUtmL3FCK2hkK1MrRHVCRURFWTFO?=
 =?utf-8?B?ZVIzRkhab2pLd29iMkljSDN4MHhPM3UxaVB0aU9LNnVLSFRkODBBUkdYTHpn?=
 =?utf-8?B?WE9MV0l4Ym11R1NCektwTURsamk2SHVaMEtuVXRqc0EzeTZCejlqekdyMmFH?=
 =?utf-8?B?dnQxc3FyY1BUYmo1bTUwWFNXaEg3N2pYMjMrVnpyT1F1Wmo0aU9yUGxSVnlo?=
 =?utf-8?B?M2Ftb3BvTTNxdmN2bHo3emtqRmJjeHZPVFQxb280ODZQVEZhNTk4dDBzS2dY?=
 =?utf-8?B?RXZQMktmMkhqQ2dGSzh3emFTSEtnYzQ1NXN6SnBaR3hZVUo5S0cwVmdtT1RF?=
 =?utf-8?B?dmVWY1ZlUnBxeXA3b1ZvNlF4UjU3UUlodnZHVjBxS3lHaWpGWTluRVhuRG1Z?=
 =?utf-8?B?Z2hvV0Q5WW5NSkRFQVRCNUlGRE1jMGlZNTcrb3p0eDVvRERvZFVkTVdzS2Jm?=
 =?utf-8?B?SGxYOWlTY1k0bm5wNkZ2blB2dnVIYTg1c0c5azZOTWx2b0UwRlZueDVKMHZM?=
 =?utf-8?B?THp1UnNBWnIrK1lGODh6bENFSVkreFg2aWlORkYzVS9BbDhjUjFER0REV3FC?=
 =?utf-8?B?eWhQTUlWZ3dmcnAxQklGRXl0cG5Dek1ydjUrUjhnOGMyUlZuMjFVTWZHNEM2?=
 =?utf-8?B?Z0tiNldibWIrOHBpejBINzhZL2EzazBKUnJNcldNT1FvVUJSTlRWRXZlMlov?=
 =?utf-8?B?bEJnNGRhNWtJaXdBN3lNc1BlY2I2MG9NdXJQazJUUHRvOW4rZ1g2YzlodXpJ?=
 =?utf-8?B?c0ZRaldScTVJUUZaVGw3YXBrZk5xK0RDOE00K2NBNlZDc1BQRnVYNHU0dU41?=
 =?utf-8?B?b1RqQlV1R1lTSHRFUTQ1ZzU2ODl3NnpiU0J0RG9meHVoY083L1BGNVhhM1hO?=
 =?utf-8?B?WXcvd280Sk51aVdUTmpBbnE4T1NoVkQ0eThudW1xcG9tZko1NVBYRXlsbDVa?=
 =?utf-8?B?MDdTRTNQMDBaK3FqUjZMQW5acFpTVXo4Nk92MWpBeTk5RlFjUnNNaFFYRjZG?=
 =?utf-8?B?THZzNjFvd0RSc2FmR3pxQWdEUENndFhJcnRMcVdRVk5VUW5UUU9rZndLQyt5?=
 =?utf-8?B?REhLM2xURWZVMUdNSzNMRVJwcUVvWHNLRjQ1WjQ3aVdDQ25lV3NsZHJ6eUZP?=
 =?utf-8?B?NkkrcHBaWTVLK0dEblN4WDEwZDBTaTdJMXZxeWw1bVoxbDNKSzdNNGRhMCtT?=
 =?utf-8?B?c2xYblc0dHhRVTI4N3E1UGFrejFFRkhzenRZN1FkU3NQOTlTZ0FUWGxhVlZD?=
 =?utf-8?B?ZCtZYVJXZDlmK2xtaVpORzZWa1IxZVdHYnQ4TzBSNmNVMU9BWUZQclpBcUwr?=
 =?utf-8?B?MVNqQmZGTkFOY3EvMWx5eThRYlFtS0VDeWUwa0NPQks0bDFpMlNXNXZxbnRh?=
 =?utf-8?B?aG9UaGIzR01XeVZ0MkpINjY2akphci9zamlBV1JDZW9KWmQ3a2hid2g1NUlY?=
 =?utf-8?B?WWVaVXZybHhwR29MOFUrbFN4VmlIa2VKSnNsQ0NlMUNpL0tVTlJtdllvVlRl?=
 =?utf-8?Q?Jm6UavRba5lsVh23/pSpDuLOF?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3541a7f7-2836-4c28-8b53-08db7141030b
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5022.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jun 2023 03:47:04.3781
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: tAIcxzaQpuKC6+YJnZtd05nyyvrN60nRBkeAi0qxkBBb59koyg/CR1MowfXXrwUQNuexU9jX0FkvBFto61+xQQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEZPR06MB6644
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Function gfs2_freeze_func causes a deadlock，because sd_freeze_mutex was
not released when return

Signed-off-by: Li Dong <lidong@vivo.com>
---
 fs/gfs2/super.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -741,8 +741,10 @@ void gfs2_freeze_func(struct work_struct *work)
 	set_bit(SDF_FROZEN, &sdp->sd_flags);
 
 	error = gfs2_do_thaw(sdp);
-	if (error)
+	if (error) {
+		mutex_unlock(&sdp->sd_freeze_mutex);
 		goto out;
+	}
 
 	clear_bit(SDF_FROZEN, &sdp->sd_flags);
 
-- 
2.31.1.windows.1