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 2A3C622A7EA; Mon, 2 Jun 2025 15:05:30 +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=1748876730; cv=none; b=hj4kYf4WHj/MfYDxyN6b7xKJ5Oz7GQ1Ko2mB9XhP1l3pBtoo+TXhyI18GbgiGJfxzjDGucZfm2EaEMIVTtbnQtm9p7TD9afGe6UDGfKmPkLenLT9srAxyBeJNOkyVgneltd8vgZhrYNR49SeVYEKTf6XdXeOOeCviQPmtLjwv7o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748876730; c=relaxed/simple; bh=jcw04BBZ/ZwPJb97P20hThL/Jle/flxBjJ/KPE8BH7U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cq6FYtFHBaC8dtVRHi+f4ozuf1ZnPzlVKskPweYYoOAtE02UxjbciJNS2SO7ybuEM6/OTbEVngGD1kHu30ZatirY4D+iJy+mg013jNemuV0RuMfyJ86kH2UCAUWtNjkSyxFbCsB0Zzbxo+LC05uG0ufEQ03S2RvloIJ0avBG+D4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Qb8WMb86; 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="Qb8WMb86" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8E4D4C4CEEB; Mon, 2 Jun 2025 15:05:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748876730; bh=jcw04BBZ/ZwPJb97P20hThL/Jle/flxBjJ/KPE8BH7U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qb8WMb86CKrwxi1zr+Jt8DeiNGJLkAZahKOZtTOM7yE4IMXXuqwfvlKl7fO/xFu7H xhR7UGDlBOhvXb9QlCjWHWfUuu/myn8Q6wESNno33/2iqViaO63OFOsrqtdgB2RRRG bDhw11SnJBBp8bxainEZK71G3+HfaqfLiVXrW8Wg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Filipe Manana , David Sterba , Sasha Levin Subject: [PATCH 6.1 056/325] btrfs: send: return -ENAMETOOLONG when attempting a path that is too long Date: Mon, 2 Jun 2025 15:45:32 +0200 Message-ID: <20250602134322.038907479@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602134319.723650984@linuxfoundation.org> References: <20250602134319.723650984@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 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Filipe Manana [ Upstream commit a77749b3e21813566cea050bbb3414ae74562eba ] When attempting to build a too long path we are currently returning -ENOMEM, which is very odd and misleading. So update fs_path_ensure_buf() to return -ENAMETOOLONG instead. Also, while at it, move the WARN_ON() into the if statement's expression, as it makes it clear what is being tested and also has the effect of adding 'unlikely' to the statement, which allows the compiler to generate better code as this condition is never expected to happen. Signed-off-by: Filipe Manana Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/send.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index a2b95ccb4cf5c..0735decec99b1 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -431,10 +431,8 @@ static int fs_path_ensure_buf(struct fs_path *p, int len) if (p->buf_len >= len) return 0; - if (len > PATH_MAX) { - WARN_ON(1); - return -ENOMEM; - } + if (WARN_ON(len > PATH_MAX)) + return -ENAMETOOLONG; path_len = p->end - p->start; old_buf_len = p->buf_len; -- 2.39.5