All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jan Kara <jack@suse.cz>
To: Ted Tso <tytso@mit.edu>
Cc: <linux-ext4@vger.kernel.org>, Lukas Czerner <lczerner@redhat.com>,
	Jan Kara <jack@suse.cz>
Subject: [PATCH 5/6] ext4: Handle add_system_zone() failure in ext4_setup_system_zone()
Date: Mon, 27 Jul 2020 13:44:28 +0200	[thread overview]
Message-ID: <20200727114429.1478-6-jack@suse.cz> (raw)
In-Reply-To: <20200727114429.1478-1-jack@suse.cz>

There's one place that fails to handle error from add_system_zone() call
and thus we can fail to protect superblock and group-descriptor blocks
properly in case of ENOMEM. Fix it.

Reported-by: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: Jan Kara <jack@suse.cz>
---
 fs/ext4/block_validity.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fs/ext4/block_validity.c b/fs/ext4/block_validity.c
index 9c40214f31f9..2d008c1b58f2 100644
--- a/fs/ext4/block_validity.c
+++ b/fs/ext4/block_validity.c
@@ -235,10 +235,13 @@ int ext4_setup_system_zone(struct super_block *sb)
 	for (i=0; i < ngroups; i++) {
 		cond_resched();
 		if (ext4_bg_has_super(sb, i) &&
-		    ((i < 5) || ((i % flex_size) == 0)))
-			add_system_zone(system_blks,
+		    ((i < 5) || ((i % flex_size) == 0))) {
+			ret = add_system_zone(system_blks,
 					ext4_group_first_block_no(sb, i),
 					ext4_bg_num_gdb(sb, i) + 1, 0);
+			if (ret)
+				goto err;
+		}
 		gdp = ext4_get_group_desc(sb, i, NULL);
 		ret = add_system_zone(system_blks,
 				ext4_block_bitmap(sb, gdp), 1, 0);
-- 
2.16.4


  parent reply	other threads:[~2020-07-27 11:44 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-27 11:44 [PATCH 0/6 v2] ext4: Check journal inode extents more carefully Jan Kara
2020-07-27 11:44 ` [PATCH 1/6] ext4: Handle error of ext4_setup_system_zone() on remount Jan Kara
2020-07-27 11:44 ` [PATCH 2/6] ext4: Don't allow overlapping system zones Jan Kara
2020-07-27 11:44 ` [PATCH 3/6] ext4: Check journal inode extents more carefully Jan Kara
2020-07-28  9:10   ` luomeng
2020-07-28 12:56     ` Jan Kara
2020-07-27 11:44 ` [PATCH 4/6] ext4: Fold ext4_data_block_valid_rcu() into the caller Jan Kara
2020-07-27 11:44 ` Jan Kara [this message]
2020-07-27 12:39   ` [PATCH 5/6] ext4: Handle add_system_zone() failure in ext4_setup_system_zone() Lukas Czerner
2020-07-27 11:44 ` [PATCH 6/6] ext4: Correctly restore system zone info when remount fails Jan Kara
2020-07-27 12:43   ` Lukas Czerner
2020-07-28 13:04 [PATCH 0/6 v3] ext4: Check journal inode extents more carefully Jan Kara
2020-07-28 13:04 ` [PATCH 5/6] ext4: Handle add_system_zone() failure in ext4_setup_system_zone() Jan Kara

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200727114429.1478-6-jack@suse.cz \
    --to=jack@suse.cz \
    --cc=lczerner@redhat.com \
    --cc=linux-ext4@vger.kernel.org \
    --cc=tytso@mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.