All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johannes Thumshirn <jthumshirn@suse.de>
To: David Sterba <dsterba@suse.com>
Cc: Linux BTRFS Mailinglist <linux-btrfs@vger.kernel.org>,
	Chris Mason <clm@fb.com>, Richard Weinberger <richard@nod.at>,
	David Gstir <david@sigma-star.at>,
	Nikolay Borisov <nborisov@suse.com>,
	Johannes Thumshirn <jthumshirn@suse.de>
Subject: [PATCH v2 08/13] btrfs: check for supported superblock checksum type before checksum validation
Date: Thu, 16 May 2019 10:47:58 +0200	[thread overview]
Message-ID: <20190516084803.9774-9-jthumshirn@suse.de> (raw)
In-Reply-To: <20190516084803.9774-1-jthumshirn@suse.de>

Now that we have factorerd out the superblock checksum type validation, we
can check for supported superblock checksum types before doing the actual
validation of the superblock read from disk.

This leads the path to further simplifications of btrfs_check_super_csum()
later on.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
---
 fs/btrfs/disk-io.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index ab13282d91d2..74937effaed4 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2822,6 +2822,14 @@ int open_ctree(struct super_block *sb,
 		goto fail_alloc;
 	}
 
+	if (!btrfs_supported_super_csum((struct btrfs_super_block *)
+					bh->b_data)) {
+		btrfs_err(fs_info, "unsupported checksum algorithm");
+		err = -EINVAL;
+		brelse(bh);
+		goto fail_alloc;
+	}
+
 	/*
 	 * We want to check superblock checksum, the type is stored inside.
 	 * Pass the whole disk block of size BTRFS_SUPER_INFO_SIZE (4k).
-- 
2.16.4


  parent reply	other threads:[~2019-05-16  8:48 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-16  8:47 [PATCH v2 00/13] Add support for SHA-256 checksums Johannes Thumshirn
2019-05-16  8:47 ` [PATCH v2 01/13] btrfs: use btrfs_csum_data() instead of directly calling crc32c Johannes Thumshirn
2019-05-16  8:47 ` [PATCH v2 02/13] btrfs: resurrect btrfs_crc32c() Johannes Thumshirn
2019-05-16  8:47 ` [PATCH v2 03/13] btrfs: use btrfs_crc32c{,_final}() in for free space cache Johannes Thumshirn
2019-05-16  8:47 ` [PATCH v2 04/13] btrfs: don't assume ordered sums to be 4 bytes Johannes Thumshirn
2019-05-21 12:42   ` Nikolay Borisov
2019-05-21 13:10   ` Johannes Thumshirn
2019-05-21 13:14     ` Nikolay Borisov
2019-05-16  8:47 ` [PATCH v2 05/13] btrfs: dont assume compressed_bio " Johannes Thumshirn
2019-05-21 12:56   ` Nikolay Borisov
2019-05-21 13:00     ` Johannes Thumshirn
2019-05-16  8:47 ` [PATCH v2 06/13] btrfs: format checksums according to type for printing Johannes Thumshirn
2019-05-16  8:47 ` [PATCH v2 07/13] btrfs: add common checksum type validation Johannes Thumshirn
2019-05-21 14:04   ` David Sterba
2019-05-16  8:47 ` Johannes Thumshirn [this message]
2019-05-21 12:58   ` [PATCH v2 08/13] btrfs: check for supported superblock checksum type before checksum validation Nikolay Borisov
2019-05-21 14:06   ` David Sterba
2019-05-16  8:47 ` [PATCH v2 09/13] btrfs: Simplify btrfs_check_super_csum() and get rid of size assumptions Johannes Thumshirn
2019-05-21 13:01   ` Nikolay Borisov
2019-05-21 13:23     ` Johannes Thumshirn
2019-05-16  8:48 ` [PATCH v2 10/13] btrfs: add boilerplate code for directly including the crypto framework Johannes Thumshirn
2019-05-21 14:11   ` David Sterba
2019-05-16  8:48 ` [PATCH v2 11/13] btrfs: directly call into crypto framework for checsumming Johannes Thumshirn
2019-05-21 14:22   ` David Sterba
2019-05-22  8:06     ` Johannes Thumshirn
2019-05-16  8:48 ` [PATCH v2 12/13] btrfs: remove assumption about csum type form btrfs_print_data_csum_error() Johannes Thumshirn
2019-05-21 13:02   ` Nikolay Borisov
2019-05-16  8:48 ` [PATCH v2 13/13] btrfs: add sha256 as another checksum algorithm Johannes Thumshirn

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=20190516084803.9774-9-jthumshirn@suse.de \
    --to=jthumshirn@suse.de \
    --cc=clm@fb.com \
    --cc=david@sigma-star.at \
    --cc=dsterba@suse.com \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=nborisov@suse.com \
    --cc=richard@nod.at \
    /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.