Commit 0000ff25 authored by Christian Brauner's avatar Christian Brauner
Browse files

Merge tag 'exportfs-6.9' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/cel/linux 

Merge exportfs fixes from Chuck Lever:

* tag 'exportfs-6.9' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  fs: Create a generic is_dot_dotdot() utility
  exportfs: fix the fallback implementation of the get_name export operation

Link: https://lore.kernel.org/r/BDC2AEB4-7085-4A7C-8DE8-A659FE1DBA6A@oracle.com


Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parents bd46543d 42c3732f

fs/crypto/fname.c

+1 −7
Original line number Diff line number Diff line
@@ -74,13 +74,7 @@ struct fscrypt_nokey_name { 


static inline bool fscrypt_is_dot_dotdot(const struct qstr *str)

{

	if (str->len == 1 && str->name[0] == '.')

		return true;



	if (str->len == 2 && str->name[0] == '.' && str->name[1] == '.')

		return true;



	return false;

	return is_dot_dotdot(str->name, str->len);

}



/**

fs/ecryptfs/crypto.c

+0 −10
Original line number Diff line number Diff line
@@ -1949,16 +1949,6 @@ int ecryptfs_encrypt_and_encode_filename( 
	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

 * @plaintext_name: The plaintext name

fs/exportfs/expfs.c

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ static bool filldir_one(struct dir_context *ctx, const char *name, int len, 
		container_of(ctx, struct getdents_callback, ctx);



	buf->sequence++;

	if (buf->ino == ino && len <= NAME_MAX) {

	if (buf->ino == ino && len <= NAME_MAX && !is_dot_dotdot(name, len)) {

		memcpy(buf->name, name, len);

		buf->name[len] = '\0';

		buf->found = 1;

fs/f2fs/f2fs.h

+0 −11
Original line number Diff line number Diff line
@@ -3364,17 +3364,6 @@ static inline bool f2fs_cp_error(struct f2fs_sb_info *sbi) 
	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,

					size_t size, gfp_t flags)

{

fs/namei.c

+2 −4
Original line number Diff line number Diff line
@@ -2676,10 +2676,8 @@ static int lookup_one_common(struct mnt_idmap *idmap, 
	if (!len)

		return -EACCES;



	if (unlikely(name[0] == '.')) {

		if (len < 2 || (len == 2 && name[1] == '.'))

	if (is_dot_dotdot(name, len))

		return -EACCES;

	}



	while (len--) {

		unsigned int c = *(const unsigned char *)name++;