Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0CF55F5A8B1 for ; Mon, 20 Apr 2026 19:16:52 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4fzwGC4RYVz2yqT; Tue, 21 Apr 2026 05:16:51 +1000 (AEST) Authentication-Results: lists.ozlabs.org; arc=pass smtp.remote-ip=103.117.158.51 arc.chain=zohomail.in ARC-Seal: i=2; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1776712611; cv=pass; b=FlqRbypSJeSoe2ktz3AnSl2UYsdWP3e4Zr/NJvlgtEBCnBCwyiIqEY59VnK6aWQnT8xVMZL6rE6v6goOpQim/3Q6FHJMR5uEKadXUo7/ZlPIBAoRnnmKs45ROr7dky3rjjUGaSbxJr0l2wxRPuCndD4w8QUfSfS0+AsD1iZWz1PVlm9SegChk2Ev5N/K8OMnLCELHE95BZXogLD6HU/Ju3gt33IEObBDYVDncCidwOdOxVOCUpewokDd5UzmJ8OOYxFA+YbdAJW7aadFU++o3VvzKNygMjzydSH1+tJe+1aINLqOxwyujhcbWCgKV6fwrwXucylyGgOjKVPCevEMhg== ARC-Message-Signature: i=2; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1776712611; c=relaxed/relaxed; bh=wHPhsJ56NziDuRq0Cg7GMkLz2qfAutJ9HvJRIZaOIgM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=LU8hPRVrTtkqhlAsZWOmRtUI6OPlmiav/x8pW686MOYkCqnqkwgMEc1V0/yIBC4UaQLaFwmAbCmYrXnnKOvu82FkVZQnbIt2poHvsFm/VIA/jB+s6iEDZfYY8ON4SonBHfKemxc0RsKol7Map1PM8e30m2evZd8XfFx/WXh3wXDP5u4L95k5Or6FIa6bNNTARiFE+PfwHzmsX6qzpktZZOtg6YXsxGvaKh2qG5jwZv67R2jyZi1qMKYALS49lKHRwDSSsFaRy0w0UiUm/ZINb63muIm1pPns8/qeVKxbb4M3zkqozhH1yUYeVu9JdUOviGZ399oiISA790MkCcyFYw== ARC-Authentication-Results: i=2; lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=vnsh.in; dkim=pass (1024-bit key; unprotected) header.d=vnsh.in header.i=ch@vnsh.in header.a=rsa-sha256 header.s=zoho header.b=agDrJjnr; dkim-atps=neutral; spf=pass (client-ip=103.117.158.51; helo=sender-of-o51.zoho.in; envelope-from=ch@vnsh.in; receiver=lists.ozlabs.org) smtp.mailfrom=vnsh.in Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=vnsh.in Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=vnsh.in header.i=ch@vnsh.in header.a=rsa-sha256 header.s=zoho header.b=agDrJjnr; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vnsh.in (client-ip=103.117.158.51; helo=sender-of-o51.zoho.in; envelope-from=ch@vnsh.in; receiver=lists.ozlabs.org) Received: from sender-of-o51.zoho.in (sender-of-o51.zoho.in [103.117.158.51]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4fzwGB5Mhhz2ypw for ; Tue, 21 Apr 2026 05:16:50 +1000 (AEST) ARC-Seal: i=1; a=rsa-sha256; t=1776712606; cv=none; d=zohomail.in; s=zohoarc; b=LfMFaeBDkQxJAuN7naxtd6pM+4LyA3l7gvnOMKVzRmXBOscWgBvD+JC4N8W1NYPmRvnxE0fhvb5vLqnnUWhQHx8Tm0wXHKdo7cn9EmRO+9HNsfZNYyiH9yvA0Kg7y9TSQAaaLhrueCR6WRuC/pv8lps0LZW4kT6AsZcfQi5Uv9Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.in; s=zohoarc; t=1776712606; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=wHPhsJ56NziDuRq0Cg7GMkLz2qfAutJ9HvJRIZaOIgM=; b=MqnNOa/1JaWrXxpALj5K1GDTitLMcDZIPjXHyQ7eW21UfeASAptoI8T2s6LFDE+YjJMhA4dKDD5FFspTzgHtOmMfa0A/yj/10ksjBHOb+cUGDi7U5RQd1jUIPJzo1quWSgz6G36eKL9xWEYoMlIsF+RsORnIK+PtP+f8XX5CTV0= ARC-Authentication-Results: i=1; mx.zohomail.in; dkim=pass header.i=vnsh.in; spf=pass smtp.mailfrom=ch@vnsh.in; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1776712606; s=zoho; d=vnsh.in; i=ch@vnsh.in; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=wHPhsJ56NziDuRq0Cg7GMkLz2qfAutJ9HvJRIZaOIgM=; b=agDrJjnr00oRrlvTFM9691vXjWLvxNsoO77tcZE1A66toWJVBJI9mc16VBBN7fC9 msEf5OVbbCAgU4yom+USBGlCHE4VryIkOk37n2UQbjgZNOiHE4PH6Dz88gqeeMKvieb S6wB4OoD2zVpbSnBJpNF/0FmPlDvikVbb4qnAg0s= Received: by mx.zoho.in with SMTPS id 1776712604445807.7006698145101; Tue, 21 Apr 2026 00:46:44 +0530 (IST) From: Vansh Choudhary To: linux-erofs@lists.ozlabs.org Cc: Vansh Choudhary Subject: [PATCH] erofs-utils: lib: restore path on erofs_rebuild_get_dentry() errors Date: Tue, 21 Apr 2026 00:46:43 +0530 Message-ID: <20260420191643.73204-1-ch@vnsh.in> X-Mailer: git-send-email 2.43.0 X-Mailing-List: linux-erofs@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External erofs_rebuild_get_dentry() temporarily writes '\0' over each '/' in the caller's path to NUL-terminate segments, but two error returns skip the restoration and leave the path truncated. Restore the slash before those returns. Fixes: 73e321a0fb3b ("erofs-utils: lib: consolidate erofs_rebuild_get_dentry()") Signed-off-by: Vansh Choudhary --- lib/rebuild.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/rebuild.c b/lib/rebuild.c index 74bbeda..14013cf 100644 --- a/lib/rebuild.c +++ b/lib/rebuild.c @@ -123,8 +123,10 @@ struct erofs_dentry *erofs_rebuild_get_dentry(struct erofs_inode *pwd, d = erofs_d_lookup(pwd, s); if (d) { if (d->type != EROFS_FT_DIR) { - if (slash) + if (slash) { + *slash = '/'; return ERR_PTR(-ENOTDIR); + } } else if (to_head) { list_del(&d->d_child); list_add(&d->d_child, &pwd->i_subdirs); @@ -132,8 +134,10 @@ struct erofs_dentry *erofs_rebuild_get_dentry(struct erofs_inode *pwd, pwd = d->inode; } else if (slash) { d = erofs_rebuild_mkdir(pwd, s); - if (IS_ERR(d)) + if (IS_ERR(d)) { + *slash = '/'; return d; + } } else { d = erofs_d_alloc(pwd, s); if (IS_ERR(d)) -- 2.43.0