Skip to content

Commit 6bd593b

Browse files
committed
Merge tag 'unicode-next-6.8' of git://git.kernel.org/pub/scm/linux/kernel/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
2 parents acc6576 + b837a81 commit 6bd593b

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22283,7 +22283,7 @@ F: drivers/usb/common/ulpi.c
2228322283
F: include/linux/ulpi/
2228422284

2228522285
UNICODE SUBSYSTEM
22286-
M: Gabriel Krisman Bertazi <krisman@collabora.com>
22286+
M: Gabriel Krisman Bertazi <krisman@kernel.org>
2228722287
2228822288
S: Supported
2228922289
F: fs/unicode/

fs/ecryptfs/inode.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,14 @@ static struct inode *__ecryptfs_get_inode(struct inode *lower_inode,
7878

7979
if (lower_inode->i_sb != ecryptfs_superblock_to_lower(sb))
8080
return ERR_PTR(-EXDEV);
81+
82+
/* Reject dealing with casefold directories. */
83+
if (IS_CASEFOLDED(lower_inode)) {
84+
pr_err_ratelimited("%s: Can't handle casefolded directory.\n",
85+
__func__);
86+
return ERR_PTR(-EREMOTE);
87+
}
88+
8189
if (!igrab(lower_inode))
8290
return ERR_PTR(-ESTALE);
8391
inode = iget5_locked(sb, (unsigned long)lower_inode,

0 commit comments

Comments
 (0)