dilim/openssh-portable
1
0 Fork 0
mirror of https://github.com/openssh/openssh-portable.git synced 2026-11-06 05:16:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream: Move negative-FD checks to before first use. CID 909998,

Browse Source 
ok djm@

OpenBSD-Commit-ID: f0208911d27fd5bd66cd608c7b6fb5a36002d6a5
This commit is contained in:
dtucker@openbsd.org authored and Darren Tucker committed 2026-07-01 10:59:10 +10:00
1 parent 296393226e
commit 8b05bbeb29
1 file changed
+7 -2
Download Patch File Download Diff File Expand all files Collapse all files
sftp-server.c
+7 -2
View File
@@ -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 &&