From: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Fri, 3 Oct 2025 01:03:45 +0000 (+0000)
Subject: upstream: If write() returned short, the subsequent write would restart
X-Git-Tag: V_10_1_P1~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fremotes%2Fgithub-selfhosted%2Fmaster;p=thirdparty%2Fopenssh-portable.git

upstream: If write() returned short, the subsequent write would restart

from the beginning of the buffer not the end of what was written.  Fix, since
we want modpipe to corrupt data for testing purposes deliberately not
accidentally.  ok djm@

OpenBSD-Regress-ID: 50ca74d287445c58944f070bb92dc13b1d054b43
---

diff --git a/regress/modpipe.c b/regress/modpipe.c
index 5f4824b51..5ef2f12ed 100644
--- a/regress/modpipe.c
+++ b/regress/modpipe.c
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $OpenBSD: modpipe.c,v 1.6 2013/11/21 03:16:47 djm Exp $ */
+/* $OpenBSD: modpipe.c,v 1.7 2025/10/03 01:03:45 dtucker Exp $ */
 
 #include "includes.h"
 
@@ -127,7 +127,7 @@ main(int argc, char **argv)
 			}
 		}
 		for (o = 0; o < s; o += r) {
-			r = write(STDOUT_FILENO, buf, s - o);
+			r = write(STDOUT_FILENO, buf + o, s - o);
 			if (r == 0)
 				break;
 			if (r < 0) {