From: Eric Biggers <ebiggers@kernel.org> To: linux-fscrypt@vger.kernel.org Cc: linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH 1/6] fs-verity: fix crash on read error in build_merkle_tree_level() Date: Sun, 11 Aug 2019 14:35:52 -0700 [thread overview] Message-ID: <20190811213557.1970-2-ebiggers@kernel.org> (raw) In-Reply-To: <20190811213557.1970-1-ebiggers@kernel.org> From: Eric Biggers <ebiggers@google.com> In build_merkle_tree_level(), use a separate fsverity_err() statement when failing to read a data page, rather than incorrectly reusing the one for failure to read a Merkle tree page and accessing level_start[] out of bounds due to 'params->level_start[level - 1]' when level == 0. Fixes: 248676649d53 ("fs-verity: implement FS_IOC_ENABLE_VERITY ioctl") Signed-off-by: Eric Biggers <ebiggers@google.com> --- fs/verity/enable.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/fs/verity/enable.c b/fs/verity/enable.c index 3371d51563962..eabc6ac199064 100644 --- a/fs/verity/enable.c +++ b/fs/verity/enable.c @@ -43,19 +43,27 @@ static int build_merkle_tree_level(struct inode *inode, unsigned int level, pr_debug("Hashing block %llu of %llu for level %u\n", i + 1, num_blocks_to_hash, level); - if (level == 0) + if (level == 0) { /* Leaf: hashing a data block */ src_page = read_mapping_page(inode->i_mapping, i, NULL); - else + if (IS_ERR(src_page)) { + err = PTR_ERR(src_page); + fsverity_err(inode, + "Error %d reading data page %llu", + err, i); + return err; + } + } else { /* Non-leaf: hashing hash block from level below */ src_page = vops->read_merkle_tree_page(inode, params->level_start[level - 1] + i); - if (IS_ERR(src_page)) { - err = PTR_ERR(src_page); - fsverity_err(inode, - "Error %d reading Merkle tree page %llu", - err, params->level_start[level - 1] + i); - return err; + if (IS_ERR(src_page)) { + err = PTR_ERR(src_page); + fsverity_err(inode, + "Error %d reading Merkle tree page %llu", + err, params->level_start[level - 1] + i); + return err; + } } err = fsverity_hash_page(params, inode, req, src_page, -- 2.22.0
WARNING: multiple messages have this Message-ID (diff)
From: Eric Biggers <ebiggers@kernel.org> To: linux-fscrypt@vger.kernel.org Cc: linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Subject: [f2fs-dev] [PATCH 1/6] fs-verity: fix crash on read error in build_merkle_tree_level() Date: Sun, 11 Aug 2019 14:35:52 -0700 [thread overview] Message-ID: <20190811213557.1970-2-ebiggers@kernel.org> (raw) In-Reply-To: <20190811213557.1970-1-ebiggers@kernel.org> From: Eric Biggers <ebiggers@google.com> In build_merkle_tree_level(), use a separate fsverity_err() statement when failing to read a data page, rather than incorrectly reusing the one for failure to read a Merkle tree page and accessing level_start[] out of bounds due to 'params->level_start[level - 1]' when level == 0. Fixes: 248676649d53 ("fs-verity: implement FS_IOC_ENABLE_VERITY ioctl") Signed-off-by: Eric Biggers <ebiggers@google.com> --- fs/verity/enable.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/fs/verity/enable.c b/fs/verity/enable.c index 3371d51563962..eabc6ac199064 100644 --- a/fs/verity/enable.c +++ b/fs/verity/enable.c @@ -43,19 +43,27 @@ static int build_merkle_tree_level(struct inode *inode, unsigned int level, pr_debug("Hashing block %llu of %llu for level %u\n", i + 1, num_blocks_to_hash, level); - if (level == 0) + if (level == 0) { /* Leaf: hashing a data block */ src_page = read_mapping_page(inode->i_mapping, i, NULL); - else + if (IS_ERR(src_page)) { + err = PTR_ERR(src_page); + fsverity_err(inode, + "Error %d reading data page %llu", + err, i); + return err; + } + } else { /* Non-leaf: hashing hash block from level below */ src_page = vops->read_merkle_tree_page(inode, params->level_start[level - 1] + i); - if (IS_ERR(src_page)) { - err = PTR_ERR(src_page); - fsverity_err(inode, - "Error %d reading Merkle tree page %llu", - err, params->level_start[level - 1] + i); - return err; + if (IS_ERR(src_page)) { + err = PTR_ERR(src_page); + fsverity_err(inode, + "Error %d reading Merkle tree page %llu", + err, params->level_start[level - 1] + i); + return err; + } } err = fsverity_hash_page(params, inode, req, src_page, -- 2.22.0 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
next prev parent reply other threads:[~2019-08-11 21:37 UTC|newest] Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-11 21:35 [PATCH 0/6] fs-verity fixups Eric Biggers 2019-08-11 21:35 ` [f2fs-dev] " Eric Biggers 2019-08-11 21:35 ` Eric Biggers [this message] 2019-08-11 21:35 ` [f2fs-dev] [PATCH 1/6] fs-verity: fix crash on read error in build_merkle_tree_level() Eric Biggers 2019-08-11 21:35 ` [f2fs-dev] [PATCH 2/6] ext4: skip truncate when verity in progress in ->write_begin() Eric Biggers 2019-08-11 21:35 ` Eric Biggers 2019-08-11 21:35 ` [PATCH 3/6] f2fs: " Eric Biggers 2019-08-11 21:35 ` [f2fs-dev] " Eric Biggers 2019-08-12 12:25 ` Chao Yu 2019-08-12 12:25 ` [f2fs-dev] " Chao Yu 2019-08-12 12:25 ` Chao Yu 2019-08-12 22:58 ` [f2fs-dev] " Eric Biggers 2019-08-12 22:58 ` Eric Biggers 2019-08-13 2:40 ` [f2fs-dev] " Chao Yu 2019-08-13 2:40 ` Chao Yu 2019-08-13 2:40 ` Chao Yu 2019-08-18 20:24 ` [f2fs-dev] " Eric Biggers 2019-08-18 20:24 ` Eric Biggers 2019-08-11 21:35 ` [PATCH 4/6] ext4: remove ext4_bio_encrypted() Eric Biggers 2019-08-11 21:35 ` [f2fs-dev] " Eric Biggers 2019-08-11 21:35 ` [PATCH 5/6] ext4: fix comment in ext4_end_enable_verity() Eric Biggers 2019-08-11 21:35 ` [f2fs-dev] " Eric Biggers 2019-08-11 21:35 ` [PATCH 6/6] f2fs: use EFSCORRUPTED in f2fs_get_verity_descriptor() Eric Biggers 2019-08-11 21:35 ` [f2fs-dev] " Eric Biggers 2019-08-12 12:26 ` Chao Yu 2019-08-12 12:26 ` [f2fs-dev] " Chao Yu 2019-08-12 12:26 ` Chao Yu 2019-08-18 20:23 ` [f2fs-dev] [PATCH 0/6] fs-verity fixups Eric Biggers 2019-08-18 20:23 ` Eric Biggers
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=20190811213557.1970-2-ebiggers@kernel.org \ --to=ebiggers@kernel.org \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-f2fs-devel@lists.sourceforge.net \ --cc=linux-fscrypt@vger.kernel.org \ /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: linkBe 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.