Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2024-12-29 09:13:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fs: Create a generic is_dot_dotdot() utility

Browse Source 
De-duplicate the same functionality in several places by hoisting
the is_dot_dotdot() utility function into linux/fs.h.

Suggested-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Acked-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever 2023-12-30 19:46:00 -05:00
parent 9473c4450e
commit 42c3732fa8
6 changed files with 14 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/crypto/fname.c
View File

@ -74,13 +74,7 @@ struct fscrypt_nokey_name {
static inline bool fscrypt_is_dot_dotdot(const struct qstr *str) static inline bool fscrypt_is_dot_dotdot(const struct qstr *str)
{ {
if (str->len == 1 && str->name[0] == '.') return is_dot_dotdot(str->name, str->len);
return true;
if (str->len == 2 && str->name[0] == '.' && str->name[1] == '.')
return true;
return false;
} }
/** /**

10
fs/ecryptfs/crypto.c
View File

@ -1949,16 +1949,6 @@ int ecryptfs_encrypt_and_encode_filename(
return rc; return rc;
} }
static bool is_dot_dotdot(const char *name, size_t name_size)
{
if (name_size == 1 && name[0] == '.')
return true;
else if (name_size == 2 && name[0] == '.' && name[1] == '.')
return true;
return false;
}
/** /**
* ecryptfs_decode_and_decrypt_filename - converts the encoded cipher text name to decoded plaintext * ecryptfs_decode_and_decrypt_filename - converts the encoded cipher text name to decoded plaintext
* @plaintext_name: The plaintext name * @plaintext_name: The plaintext name

10
fs/exportfs/expfs.c
View File

@ -244,16 +244,6 @@ struct getdents_callback {
int sequence; /* sequence counter */ int sequence; /* sequence counter */
}; };
/* Copied from lookup_one_common() */
static inline bool is_dot_dotdot(const char *name, size_t len)
{
if (unlikely(name[0] == '.')) {
if (len < 2 || (len == 2 && name[1] == '.'))
return true;
}
return false;
}
/* /*
* A rather strange filldir function to capture * A rather strange filldir function to capture
* the name matching the specified inode number. * the name matching the specified inode number.

11
fs/f2fs/f2fs.h
View File

@ -3368,17 +3368,6 @@ static inline bool f2fs_cp_error(struct f2fs_sb_info *sbi)
return is_set_ckpt_flags(sbi, CP_ERROR_FLAG); return is_set_ckpt_flags(sbi, CP_ERROR_FLAG);
} }
static inline bool is_dot_dotdot(const u8 *name, size_t len)
{
if (len == 1 && name[0] == '.')
return true;
if (len == 2 && name[0] == '.' && name[1] == '.')
return true;
return false;
}
static inline void *f2fs_kmalloc(struct f2fs_sb_info *sbi, static inline void *f2fs_kmalloc(struct f2fs_sb_info *sbi,
size_t size, gfp_t flags) size_t size, gfp_t flags)
{ {

6
fs/namei.c
View File

@ -2667,10 +2667,8 @@ static int lookup_one_common(struct mnt_idmap *idmap,
if (!len) if (!len)
return -EACCES; return -EACCES;
if (unlikely(name[0] == '.')) { if (is_dot_dotdot(name, len))
if (len < 2 || (len == 2 && name[1] == '.')) return -EACCES;
return -EACCES;
}
while (len--) { while (len--) {
unsigned int c = *(const unsigned char *)name++; unsigned int c = *(const unsigned char *)name++;

11
include/linux/fs.h
View File

@ -2846,6 +2846,17 @@ extern bool path_is_under(const struct path *, const struct path *);
extern char *file_path(struct file *, char *, int); extern char *file_path(struct file *, char *, int);
/**
* is_dot_dotdot - returns true only if @name is "." or ".."
* @name: file name to check
* @len: length of file name, in bytes
*/
static inline bool is_dot_dotdot(const char *name, size_t len)
{
return len && unlikely(name[0] == '.') &&
(len == 1 || (len == 2 && name[1] == '.'));
}
#include <linux/err.h> #include <linux/err.h>
/* needed for stackable file system support */ /* needed for stackable file system support */