[openssh-commits] [openssh] 01/02: upstream: Move negative-FD checks to before first use. CID 909998,

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 8b05bbeb293c5f777915e37e9ed43a06fb8e7614
Author: dtucker at openbsd.org <dtucker at openbsd.org>
AuthorDate: Wed Jul 1 00:52:23 2026 +0000

    upstream: Move negative-FD checks to before first use. CID 909998,
    
    ok djm@
    
    OpenBSD-Commit-ID: f0208911d27fd5bd66cd608c7b6fb5a36002d6a5
---
 sftp-server.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/sftp-server.c b/sftp-server.c
index 156d5ece5..f87fc5825 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.155 2026/06/05 08:48:43 djm Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.156 2026/07/01 00:52:23 dtucker Exp $ */
 /*
  * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
  *
@@ -1633,6 +1633,11 @@ process_extended_copy_data(uint32_t id)
 	/* Disallow reading & writing to the same handle, path or inode */
 	read_fd = handle_to_fd(read_handle);
 	write_fd = handle_to_fd(write_handle);
+	if (read_fd < 0 || write_fd < 0) {
+		error_f("bad read or write fd");
+		status = errno_to_portable(EBADF);
+		goto out;
+	}
 	if (fstat(read_fd, &st_read) != 0) {
 		status = errno_to_portable(errno);
 		error_f("fstat read_fd failed: %s", strerror(errno));
@@ -1643,7 +1648,7 @@ process_extended_copy_data(uint32_t id)
 		error_f("fstat write_fd failed: %s", strerror(errno));
 		goto out;
 	}
-	if (read_handle == write_handle || read_fd < 0 || write_fd < 0 ||
+	if (read_handle == write_handle ||
 	    !strcmp(handle_to_name(read_handle), handle_to_name(write_handle)) ||
 	    (st_read.st_dev != 0 && st_read.st_ino != 0 &&
 	    st_read.st_dev == st_write.st_dev &&

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.