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 AE82F1DF242; Mon, 6 Jan 2025 15:49:42 +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=1736178582; cv=none; b=qQB6Y32BzSJNKOr9L2zrFaoMKLP+vjMZaNEZtuAN6f04EtvWZOIQnJWXUn7F/xM0aeFQo65GdPkMBRHbgpdLDORn8vtF1rzNeexriPxaVIlSde+0j9sSvrhjctPkdZ0tqCrscmGszX7Z/J7Js/lsCyRJ96y/i2IW9PPbdA+z4c8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736178582; c=relaxed/simple; bh=uwvn/10bcTPlknh9HzCsW2pIxPAdAs3WAt4YzT0+ICk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sSqyoVHtKETpOgaJInd+s50+RJ7+CadGPDX1jn0zcQpbfTt+7rXV5DNWFiJULlxdpqUkm8SYdeQiPsapuQjx7l73XmKEhIDJYL/hsFmz8Xyl7D5wMXmwndByZwEti/wrE8WmHdcKJYY4HXgRhrsv3UkM/YgH1OmSQDtgUzr+MtM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ZA3Vb8f7; 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="ZA3Vb8f7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2FA84C4CED6; Mon, 6 Jan 2025 15:49:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1736178582; bh=uwvn/10bcTPlknh9HzCsW2pIxPAdAs3WAt4YzT0+ICk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZA3Vb8f7CiAjvzydbKzQ0hIlOGyf10VzN2TEJjqim8b2DuB4yjelyIp0pIo29Jh6d 5nHfgnOEdgUI7jn9b7AvAid/solrbH1aOThX6HGWvW735L+0JvdYn3dBjEyA+zltYb xcylj4bpc/Pys51IimgOQYZWYD0sDfL4MYCYv1us= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, James Bottomley , Ard Biesheuvel Subject: [PATCH 5.15 027/168] efivarfs: Fix error on non-existent file Date: Mon, 6 Jan 2025 16:15:35 +0100 Message-ID: <20250106151139.489730410@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250106151138.451846855@linuxfoundation.org> References: <20250106151138.451846855@linuxfoundation.org> User-Agent: quilt/0.68 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 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: James Bottomley commit 2ab0837cb91b7de507daa145d17b3b6b2efb3abf upstream. When looking up a non-existent file, efivarfs returns -EINVAL if the file does not conform to the NAME-GUID format and -ENOENT if it does. This is caused by efivars_d_hash() returning -EINVAL if the name is not formatted correctly. This error is returned before simple_lookup() returns a negative dentry, and is the error value that the user sees. Fix by removing this check. If the file does not exist, simple_lookup() will return a negative dentry leading to -ENOENT and efivarfs_create() already has a validity check before it creates an entry (and will correctly return -EINVAL) Signed-off-by: James Bottomley Cc: [ardb: make efivarfs_valid_name() static] Signed-off-by: Ard Biesheuvel Signed-off-by: Greg Kroah-Hartman --- fs/efivarfs/inode.c | 2 +- fs/efivarfs/internal.h | 1 - fs/efivarfs/super.c | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) --- a/fs/efivarfs/inode.c +++ b/fs/efivarfs/inode.c @@ -47,7 +47,7 @@ struct inode *efivarfs_get_inode(struct * * VariableName-12345678-1234-1234-1234-1234567891bc */ -bool efivarfs_valid_name(const char *str, int len) +static bool efivarfs_valid_name(const char *str, int len) { const char *s = str + len - EFI_VARIABLE_GUID_LEN; --- a/fs/efivarfs/internal.h +++ b/fs/efivarfs/internal.h @@ -10,7 +10,6 @@ extern const struct file_operations efivarfs_file_operations; extern const struct inode_operations efivarfs_dir_inode_operations; -extern bool efivarfs_valid_name(const char *str, int len); extern struct inode *efivarfs_get_inode(struct super_block *sb, const struct inode *dir, int mode, dev_t dev, bool is_removable); --- a/fs/efivarfs/super.c +++ b/fs/efivarfs/super.c @@ -64,9 +64,6 @@ static int efivarfs_d_hash(const struct const unsigned char *s = qstr->name; unsigned int len = qstr->len; - if (!efivarfs_valid_name(s, len)) - return -EINVAL; - while (len-- > EFI_VARIABLE_GUID_LEN) hash = partial_name_hash(*s++, hash);