diff options
author | Darrick J. Wong <darrick.wong@oracle.com> | 2019-02-01 09:08:54 -0800 |
---|---|---|
committer | Darrick J. Wong <darrick.wong@oracle.com> | 2019-02-11 16:06:40 -0800 |
commit | e5d7d51b340aac0f4cc56677eb8d29d4e164c58c (patch) | |
tree | 772b23a8e364cb9beb88898d1ac4c6abfd979f71 /fs/xfs/libxfs/xfs_dir2.c | |
parent | 87c9607df2ff73290dcfe08d22f34687ce0142ce (diff) | |
download | linux-e5d7d51b340aac0f4cc56677eb8d29d4e164c58c.tar.gz linux-e5d7d51b340aac0f4cc56677eb8d29d4e164c58c.tar.bz2 linux-e5d7d51b340aac0f4cc56677eb8d29d4e164c58c.zip |
xfs: check directory name validity
Check directory entry names for invalid characters.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Diffstat (limited to 'fs/xfs/libxfs/xfs_dir2.c')
-rw-r--r-- | fs/xfs/libxfs/xfs_dir2.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/fs/xfs/libxfs/xfs_dir2.c b/fs/xfs/libxfs/xfs_dir2.c index 229152cd1a24..156ce95c9c45 100644 --- a/fs/xfs/libxfs/xfs_dir2.c +++ b/fs/xfs/libxfs/xfs_dir2.c @@ -703,3 +703,20 @@ xfs_dir2_shrink_inode( xfs_trans_log_inode(tp, dp, XFS_ILOG_CORE); return 0; } + +/* Returns true if the directory entry name is valid. */ +bool +xfs_dir2_namecheck( + const void *name, + size_t length) +{ + /* + * MAXNAMELEN includes the trailing null, but (name/length) leave it + * out, so use >= for the length check. + */ + if (length >= MAXNAMELEN) + return false; + + /* There shouldn't be any slashes or nulls here */ + return !memchr(name, '/', length) && !memchr(name, 0, length); +} |