From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6CBEBC433EF for ; Tue, 16 Nov 2021 01:10:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4ED2660F6E for ; Tue, 16 Nov 2021 01:10:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352405AbhKPBNC (ORCPT ); Mon, 15 Nov 2021 20:13:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:44610 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245362AbhKOTUL (ORCPT ); Mon, 15 Nov 2021 14:20:11 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5EDD96345D; Mon, 15 Nov 2021 18:33:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1637001189; bh=IX7Mb4frK77nNjSxhNq8vL9MZWZSpqf1C4gwDF0pY9M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NnABPzUmtOs4kbxXGZ0lrmMEC7NcQjO6kjh+a3Zu2xkOG8FyGd0trU9MRiVyt/CeN C48a838iFtUJ/ZAFkiOoZZ0yQ2qUwFrV7BspcxAL4uaZqPpx64WwoEfO0ZDmmrKKyf Hc693vLJmPbM1A7HciC8FK/ofqdXo7OQRoqzMx8E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Josef Bacik , Filipe Manana , David Sterba Subject: [PATCH 5.15 062/917] btrfs: fix lost error handling when replaying directory deletes Date: Mon, 15 Nov 2021 17:52:37 +0100 Message-Id: <20211115165430.868228105@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115165428.722074685@linuxfoundation.org> References: <20211115165428.722074685@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Filipe Manana commit 10adb1152d957a4d570ad630f93a88bb961616c1 upstream. At replay_dir_deletes(), if find_dir_range() returns an error we break out of the main while loop and then assign a value of 0 (success) to the 'ret' variable, resulting in completely ignoring that an error happened. Fix that by jumping to the 'out' label when find_dir_range() returns an error (negative value). CC: stable@vger.kernel.org # 4.4+ Reviewed-by: Josef Bacik Signed-off-by: Filipe Manana Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/tree-log.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -2500,7 +2500,9 @@ again: else { ret = find_dir_range(log, path, dirid, key_type, &range_start, &range_end); - if (ret != 0) + if (ret < 0) + goto out; + else if (ret > 0) break; }