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 64FCD1EF945; Mon, 21 Oct 2024 10:41:29 +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=1729507289; cv=none; b=hDcp8/W0rkNJnU3dpXKsSHkfPTRGL6dyOrbLMJyIDE5ZNvW3w48W25WsLmFp65F5ClHAH6du9cunWPUT+5blAiMVw/f1IRcKohr7kC9vfNtS9crTBl7aVAQD7BMmTMcUVw+rbxXKm217cN+lYy0wykwOxNZeGhzYx/dw7ZPFbg0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729507289; c=relaxed/simple; bh=er45FBhXgQMN3gFCN07TF4ZCCoWXHqINBsXDWJIshOA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Qa1NN0a4DTtzgEnBwUoR5+zDHll3qCeZs2t36UMvAx5x8GKL9xTWekNkcJNeAY0XHh6Y3FOWKFaPallMwXeCyr0M6QN2qmvNGrUTaSboYnApLsOzLy1VGJU+oJo1/WAkOURKiHo3ux6G9uqHPSzQ3l0x75LXmshQKmrRlaK58Gw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Mdda6ywc; 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="Mdda6ywc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 97F02C4CEC3; Mon, 21 Oct 2024 10:41:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1729507289; bh=er45FBhXgQMN3gFCN07TF4ZCCoWXHqINBsXDWJIshOA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mdda6ywcjae0GUt2lFJsNLD0Jlnc1Jkj0iV8fz8nhixK+Fz7RoqwTamngCdSJp5kj tLV2NCusE1neiZJ17LO3YyhXlCVFCURGjJV32ue7JjZtrgkfI9ZZut/G8muA/72rb/ 4wUMzL6SPEfJfIysX9cmijcfGBvLjrQNGwSwn+PI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+69c9fdccc6dd08961d34@syzkaller.appspotmail.com, Jan Kara , Thadeu Lima de Souza Cascardo Subject: [PATCH 6.1 09/91] udf: Implement searching for directory entry using new iteration code Date: Mon, 21 Oct 2024 12:24:23 +0200 Message-ID: <20241021102250.167573110@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241021102249.791942892@linuxfoundation.org> References: <20241021102249.791942892@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org 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: Jan Kara [ Upstream commit 1c80afa04db39c98aebea9aabfafa37a208cdfee ] Implement searching for directory entry - udf_fiiter_find_entry() - using new directory iteration code. Reported-by: syzbot+69c9fdccc6dd08961d34@syzkaller.appspotmail.com Signed-off-by: Jan Kara Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Greg Kroah-Hartman --- fs/udf/namei.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) --- a/fs/udf/namei.c +++ b/fs/udf/namei.c @@ -141,6 +141,73 @@ int udf_write_fi(struct inode *inode, st } /** + * udf_fiiter_find_entry - find entry in given directory. + * + * @dir: directory inode to search in + * @child: qstr of the name + * @iter: iter to use for searching + * + * This function searches in the directory @dir for a file name @child. When + * found, @iter points to the position in the directory with given entry. + * + * Returns 0 on success, < 0 on error (including -ENOENT). + */ +static int udf_fiiter_find_entry(struct inode *dir, const struct qstr *child, + struct udf_fileident_iter *iter) +{ + int flen; + unsigned char *fname = NULL; + struct super_block *sb = dir->i_sb; + int isdotdot = child->len == 2 && + child->name[0] == '.' && child->name[1] == '.'; + int ret; + + fname = kmalloc(UDF_NAME_LEN, GFP_NOFS); + if (!fname) + return -ENOMEM; + + for (ret = udf_fiiter_init(iter, dir, 0); + !ret && iter->pos < dir->i_size; + ret = udf_fiiter_advance(iter)) { + if (iter->fi.fileCharacteristics & FID_FILE_CHAR_DELETED) { + if (!UDF_QUERY_FLAG(sb, UDF_FLAG_UNDELETE)) + continue; + } + + if (iter->fi.fileCharacteristics & FID_FILE_CHAR_HIDDEN) { + if (!UDF_QUERY_FLAG(sb, UDF_FLAG_UNHIDE)) + continue; + } + + if ((iter->fi.fileCharacteristics & FID_FILE_CHAR_PARENT) && + isdotdot) + goto out_ok; + + if (!iter->fi.lengthFileIdent) + continue; + + flen = udf_get_filename(sb, iter->name, + iter->fi.lengthFileIdent, fname, UDF_NAME_LEN); + if (flen < 0) { + ret = flen; + goto out_err; + } + + if (udf_match(flen, fname, child->len, child->name)) + goto out_ok; + } + if (!ret) + ret = -ENOENT; + +out_err: + udf_fiiter_release(iter); +out_ok: + kfree(fname); + + return ret; +} + +/** * udf_find_entry - find entry in given directory. * * @dir: directory inode to search in