Commit c668da99 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux 

Pull fscrypt fix from Eric Biggers:
 "Fix an UBSAN warning that started occurring when the block layer
  started supporting logical_block_size > PAGE_SIZE"

* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux:
  fscrypt: fix left shift underflow when inode->i_blkbits > PAGE_SHIFT
parents c90841db 1e39da97

fs/crypto/inline_crypt.c

+1 −2
Original line number Diff line number Diff line
@@ -333,8 +333,7 @@ static bool bh_get_inode_and_lblk_num(const struct buffer_head *bh, 
	inode = mapping->host;



	*inode_ret = inode;

	*lblk_num_ret = ((u64)folio->index << (PAGE_SHIFT - inode->i_blkbits)) +

			(bh_offset(bh) >> inode->i_blkbits);

	*lblk_num_ret = (folio_pos(folio) + bh_offset(bh)) >> inode->i_blkbits;

	return true;

}