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

torvalds · torvalds · commit c668da99b923 · 2025-11-06T12:45:15.000-08:00
Pull fscrypt fix from Eric Biggers:
 "Fix an UBSAN warning that started occurring when the block layer
  started supporting logical_block_size &gt; PAGE_SIZE"

* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux:
  fscrypt: fix left shift underflow when inode-&gt;i_blkbits &gt; PAGE_SHIFT
diff --git a/fs/crypto/inline_crypt.c b/fs/crypto/inline_crypt.c
@@ -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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -333,8 +333,7 @@ static bool bh_get_inode_and_lblk_num(const struct buffer_head *bh,`
`333`	`333`	`inode = mapping->host;`
`334`	`334`
`335`	`335`	`*inode_ret = inode;`
`336`		`- *lblk_num_ret = ((u64)folio->index << (PAGE_SHIFT - inode->i_blkbits)) +`
`337`		`- (bh_offset(bh) >> inode->i_blkbits);`
	`336`	`+ *lblk_num_ret = (folio_pos(folio) + bh_offset(bh)) >> inode->i_blkbits;`
`338`	`337`	`return true;`
`339`	`338`	`}`
`340`	`339`