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 84B5A297A5C; Mon, 5 May 2025 22:18:49 +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=1746483529; cv=none; b=e7waycLCVXz3nsFMB2yVxZsRlmym9Z0f0TqV+SMp6Pcr5vfUoriJyMmFz1gopPPRZ4P/JTRO9x1ozUi6KDp3/31TVFc5TQRmNfzH3aMrpyOLKwYurazc2NamCsHDZPUDfAuXjGPHW5qRSkJQKAqus+PVO7kBugb9PRR4ndgElu8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746483529; c=relaxed/simple; bh=EkM3NeSGekzvGkhGGHvH8d2CEgelq7zNygAYXxGOf+Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uIh5gCS076JXslJq0m7HZ+MNHuhb0JwQaUIk6sjXswgrjLNnmdERVncPammsWhSZdUI4HcfHQ3UTtBM6rxt7rtzsj+tdQXrjyE4EU2hbhUccATUgAsfen1KdiR2D6u6MwTY9IPV5ZfBvB8izZ6t98VfEIsj2G7P0w4IfTyuz2C8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EKy3vVNR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="EKy3vVNR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8619AC4CEE4; Mon, 5 May 2025 22:18:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746483529; bh=EkM3NeSGekzvGkhGGHvH8d2CEgelq7zNygAYXxGOf+Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EKy3vVNRKRn6JBTfrCCpqi9kJ9yZQbtUZJ4Aw+XLUTNTi3YWabd2PM2QKMN9S6Sqa vlUlDNn1MMfq3islDsNQ7x8oN/iiBCcCaegPPG5fHzk5kc4L1Ga2JGeCDWaMmzRQc4 uvO9HSJ9Y+O/1Mj7xjZtmAAxp0hVLnoxGnjr5w6eX90xX0+yzvrHsRcYkW8MX1WIt8 SJpW116RIZjYHOByFmWtaEKS+nJsLlG/b1dXe4sg209osDdqe6MAPLC/DZ+3wMPSvb qyqqbM9Mcp/yjWcgUCW49dY5+fgEbzQynMH0gt7/JsChzqRVzXBxW8wkNX50e6YT+3 1EHnWZ29QnccQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Filipe Manana , David Sterba , Sasha Levin , clm@fb.com, josef@toxicpanda.com, linux-btrfs@vger.kernel.org Subject: [PATCH AUTOSEL 6.14 101/642] btrfs: send: return -ENAMETOOLONG when attempting a path that is too long Date: Mon, 5 May 2025 18:05:17 -0400 Message-Id: <20250505221419.2672473-101-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505221419.2672473-1-sashal@kernel.org> References: <20250505221419.2672473-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.14.5 Content-Transfer-Encoding: 8bit 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 f437138fefbc5..bb8a0945b0fd3 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -487,10 +487,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