From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 78AF11A4F20; Mon, 14 Oct 2024 15:07:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728918455; cv=none; b=N6ZIrGMSvi6sK+v3bSuqOblYbcHaFfOkgfii/xc3sB7B8te3UtwPypCTMGBofKG33N+nsnb/d/RHRgDbsE4nAllWLu7AE4vGWVaswdKa674vUzOJlChIcOS2s0mbwKnCgLEJ2f6uLXk+EBSTQBqL7yyfTL5iy6jfyTNIRun0i1w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728918455; c=relaxed/simple; bh=iW+t86cO+OYbFZ04aXm+bxKrL6GluOaDpT1ODlwBCo0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o1lR72/jPX9hnSktrR0hOMDBJOHx8jJBTu9SoxNQM+v5elkkBcnQZ52Q+lEw35fH72F++f3pPqV6RhGKavLxYg8Atw2fc1u6v/VjPuoSJnyTOyxXBodH8CJRQAEA/KltKaLdaPICHftzalcRNNSr0etE6LKWkvYquocQQolslUw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TILs1YxA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="TILs1YxA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E873AC4CEC7; Mon, 14 Oct 2024 15:07:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728918455; bh=iW+t86cO+OYbFZ04aXm+bxKrL6GluOaDpT1ODlwBCo0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TILs1YxALzcKoooaflAHrMTqB+dfQYREB2jtWY+DONwaeaToP9W1YlWllOyaDbf0H oKZD2/nwZBiwk9A5gTyzk0cWNTDwmahcbtD3I8U/Rz/iwAUIlV3siTbkskeq609jyJ HKhD70QkoUT171x+sdSO7HZQbJkpMNM3v3VHpifE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Amir Goldstein , Jeff Layton , Christian Brauner , Chuck Lever Subject: [PATCH 6.1 297/798] fs: Create a generic is_dot_dotdot() utility Date: Mon, 14 Oct 2024 16:14:11 +0200 Message-ID: <20241014141229.611233092@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241014141217.941104064@linuxfoundation.org> References: <20241014141217.941104064@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chuck Lever commit 42c3732fa8073717dd7d924472f1c0bc5b452fdc upstream. De-duplicate the same functionality in several places by hoisting the is_dot_dotdot() utility function into linux/fs.h. Suggested-by: Amir Goldstein Reviewed-by: Jeff Layton Reviewed-by: Amir Goldstein Acked-by: Christian Brauner Signed-off-by: Chuck Lever Signed-off-by: Greg Kroah-Hartman --- fs/crypto/fname.c | 8 +------- fs/ecryptfs/crypto.c | 10 ---------- fs/f2fs/f2fs.h | 11 ----------- fs/namei.c | 6 ++---- include/linux/fs.h | 11 +++++++++++ 5 files changed, 14 insertions(+), 32 deletions(-) --- a/fs/crypto/fname.c +++ b/fs/crypto/fname.c @@ -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); } /** --- a/fs/ecryptfs/crypto.c +++ b/fs/ecryptfs/crypto.c @@ -1973,16 +1973,6 @@ out: 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 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -3335,17 +3335,6 @@ static inline bool f2fs_cp_error(struct 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) { --- a/fs/namei.c +++ b/fs/namei.c @@ -2663,10 +2663,8 @@ static int lookup_one_common(struct user if (!len) return -EACCES; - if (unlikely(name[0] == '.')) { - if (len < 2 || (len == 2 && name[1] == '.')) - return -EACCES; - } + if (is_dot_dotdot(name, len)) + return -EACCES; while (len--) { unsigned int c = *(const unsigned char *)name++; --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3107,6 +3107,17 @@ extern bool path_is_under(const struct p 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 /* needed for stackable file system support */