Skip to content

Commit

Permalink
Merge tag 'unicode-next-6.8' of git://git.kernel.org/pub/scm/linux/ke…
Browse files Browse the repository at this point in the history
…rnel/git/krisman/unicode

Pull unicode updates from Gabriel Krisman Bertazi:
 "Other than the update to MAINTAINERS, this PR has only a fix to stop
  ecryptfs from inadvertently mounting case-insensitive filesystems that
  it cannot handle, which would otherwise caused post-mount failures"

* tag 'unicode-next-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode:
  MAINTAINERS: update unicode maintainer e-mail address
  ecryptfs: Reject casefold directory inodes
  • Loading branch information
torvalds committed Jan 11, 2024
2 parents acc6576 + b837a81 commit 6bd593b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -22283,7 +22283,7 @@ F: drivers/usb/common/ulpi.c
F: include/linux/ulpi/

UNICODE SUBSYSTEM
M: Gabriel Krisman Bertazi <krisman@collabora.com>
M: Gabriel Krisman Bertazi <krisman@kernel.org>
L: [email protected]
S: Supported
F: fs/unicode/
Expand Down
8 changes: 8 additions & 0 deletions fs/ecryptfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,14 @@ static struct inode *__ecryptfs_get_inode(struct inode *lower_inode,

if (lower_inode->i_sb != ecryptfs_superblock_to_lower(sb))
return ERR_PTR(-EXDEV);

/* Reject dealing with casefold directories. */
if (IS_CASEFOLDED(lower_inode)) {
pr_err_ratelimited("%s: Can't handle casefolded directory.\n",
__func__);
return ERR_PTR(-EREMOTE);
}

if (!igrab(lower_inode))
return ERR_PTR(-ESTALE);
inode = iget5_locked(sb, (unsigned long)lower_inode,
Expand Down

0 comments on commit 6bd593b

Please sign in to comment.