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 935AF15746B; Tue, 23 Jul 2024 18:32:13 +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=1721759533; cv=none; b=r7t+efWgiK2E6LHdJlB7uPk0VOo/Letm8YE7SvUcpokkJL9shUT2BNywI5r/mZhoCu+ET7gfykWAQQ7bptw+ZrDRSnwLY8d+KmXi+bA8miSELm0k+yzRRBPQUeaqdtcZGMyoiuvr2cHJdXlKz1tdMW6TdzHWD0iNcqO/3S7d7NQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721759533; c=relaxed/simple; bh=E4FGyTOnJTkojsHh/a0U/TwEGw0iabXRp/MaGwZrY9w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YKSPPMnR7ChdqxM2m3t1NrrqyzvXan1QjufeRiKIIcOgOFZPDbH1tiWI2OCXyN8F43Az4q9hh+0T8KmzcRK94gTQQh0w4kSOTMqL2iDqJC5DACnhUGD/z3rk6bh7OmxtJcQ7v2bB0p3qSqcOegGEdNUeHBqlUTbaIRulAnUTH/Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=alhV/wFn; 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="alhV/wFn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1AAAAC4AF09; Tue, 23 Jul 2024 18:32:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721759533; bh=E4FGyTOnJTkojsHh/a0U/TwEGw0iabXRp/MaGwZrY9w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=alhV/wFnAIi9yhdUdeJ9vUz34Gnsk+mx8rfC+hJYBpQpLbKwNhMzn8NVywMmZzy0Q UHs7CyTtM41VlcoDN3jBbCBoHRkuV94FBUgarcR2wkbD3TdQMIWFkuPt8LEg97E4rO 9QSE6iVYHndBn21tIskFdDL52bbnao4JzvfCcVNg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yuntao Wang , Jan Kara , Christian Brauner , Sasha Levin Subject: [PATCH 6.6 043/129] fs/file: fix the check in find_next_fd() Date: Tue, 23 Jul 2024 20:23:11 +0200 Message-ID: <20240723180406.452609731@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240723180404.759900207@linuxfoundation.org> References: <20240723180404.759900207@linuxfoundation.org> User-Agent: quilt/0.67 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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yuntao Wang [ Upstream commit ed8c7fbdfe117abbef81f65428ba263118ef298a ] The maximum possible return value of find_next_zero_bit(fdt->full_fds_bits, maxbit, bitbit) is maxbit. This return value, multiplied by BITS_PER_LONG, gives the value of bitbit, which can never be greater than maxfd, it can only be equal to maxfd at most, so the following check 'if (bitbit > maxfd)' will never be true. Moreover, when bitbit equals maxfd, it indicates that there are no unused fds, and the function can directly return. Fix this check. Signed-off-by: Yuntao Wang Link: https://lore.kernel.org/r/20240529160656.209352-1-yuntao.wang@linux.dev Reviewed-by: Jan Kara Signed-off-by: Christian Brauner Signed-off-by: Sasha Levin --- fs/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/file.c b/fs/file.c index 3e4a4dfa38fca..a815f6eddc511 100644 --- a/fs/file.c +++ b/fs/file.c @@ -481,12 +481,12 @@ struct files_struct init_files = { static unsigned int find_next_fd(struct fdtable *fdt, unsigned int start) { - unsigned int maxfd = fdt->max_fds; + unsigned int maxfd = fdt->max_fds; /* always multiple of BITS_PER_LONG */ unsigned int maxbit = maxfd / BITS_PER_LONG; unsigned int bitbit = start / BITS_PER_LONG; bitbit = find_next_zero_bit(fdt->full_fds_bits, maxbit, bitbit) * BITS_PER_LONG; - if (bitbit > maxfd) + if (bitbit >= maxfd) return maxfd; if (bitbit > start) start = bitbit; -- 2.43.0