Checkpoint

Author: rapier1

regress/unittests/sshbuf/test_sshbuf.c

@@ -176,6 +176,8 @@ sshbuf_tests(void)
 	ASSERT_SIZE_T_EQ(sshbuf_len(p1), 1223);
 	ASSERT_SIZE_T_EQ(sshbuf_avail(p1), 0);
 	r = sshbuf_reserve(p1, 1, &dp);
+	/* this test is currently failing. This will
+	 * be addressed ASAP. TODO. cjr 4/18/24 */
 	ASSERT_INT_EQ(r, SSH_ERR_NO_BUFFER_SPACE);
 	ASSERT_PTR_EQ(dp, NULL);
 	TEST_DONE();

sshbuf.c

@@ -367,12 +367,9 @@ sshbuf_check_reserve(const struct sshbuf *buf, size_t len)
 	if (buf->readonly || buf->refcount > 1)
 		return SSH_ERR_BUFFER_READ_ONLY;
 	SSHBUF_TELL("check");
-	/* Check that len is reasonable and that max size + available < len */
-	/* prior we'd check ((buf->max_size / 2) - len) */
-	/* cjr 4/17/24 */
-	if ((len > (buf->max_size / 2) ||
-	     ((buf->max_size - len) < (buf->size - buf->off))))
-		return SSH_ERR_NO_BUFFER_SPACE;
+        /* Check that len is reasonable and that max_size + available < len */
+        if (len > buf->max_size || buf->max_size - len < buf->size - buf->off)
+                return SSH_ERR_NO_BUFFER_SPACE;
 	return 0;
 }
 
@@ -426,7 +423,7 @@ sshbuf_allocate(struct sshbuf *buf, size_t len)
 	 * Turns out the extra functions on the following conditional aren't needed
 	 * -cjr 04/06/23
 	 */
-	if (rlen > BUF_WATERSHED && buf->type == BUF_CHANNEL_INPUT) {
+	if (rlen > BUF_WATERSHED) { // && (buf->type == BUF_CHANNEL_INPUT || buf->type == BUF_CHANNEL_OUTPUT)) {
 		/* debug_f ("Prior: label: %s, %p, rlen is %zu need is %zu win_max is %zu max_size is %zu", */
 		/*    buf->label, buf, rlen, need, buf->window_max, buf->max_size); */
 		/* easiest thing to do is grow the nuffer by 4MB each time. It might end
@@ -436,14 +433,14 @@ sshbuf_allocate(struct sshbuf *buf, size_t len)
 		/* debug_f ("Post: label: %s, %p, rlen is %zu need is %zu win_max is %zu max_size is %zu", */
 		/* 	 buf->label, buf, rlen, need, buf->window_max, buf->max_size); */
 	}
-	if (rlen > BUF_WATERSHED && buf->type == BUF_CHANNEL_OUTPUT) {
-		/* debug_f ("Pre: label: %s, %p, rlen is %zu need is %zu win_max is %zu max_size is %zu", */
-		/* 	 buf->label, buf, rlen, need, buf->window_max, buf->max_size); */
-		need = (4*1024*1024);
-		rlen = ROUNDUP(buf->alloc + need, SSHBUF_SIZE_INC);
-		/* debug_f ("Post: label: %s, %p, rlen is %zu need is %zu win_max is %zu max_size is %zu", */
-		/* 	 buf->label, buf, rlen, need, buf->window_max, buf->max_size); */
-	}
+	/* if (rlen > BUF_WATERSHED && buf->type == BUF_CHANNEL_OUTPUT) { */
+	/* 	/\* debug_f ("Pre: label: %s, %p, rlen is %zu need is %zu win_max is %zu max_size is %zu", *\/ */
+	/* 	/\* 	 buf->label, buf, rlen, need, buf->window_max, buf->max_size); *\/ */
+	/* 	need = (4*1024*1024); */
+	/* 	rlen = ROUNDUP(buf->alloc + need, SSHBUF_SIZE_INC); */
+	/* 	/\* debug_f ("Post: label: %s, %p, rlen is %zu need is %zu win_max is %zu max_size is %zu", *\/ */
+	/* 	/\* 	 buf->label, buf, rlen, need, buf->window_max, buf->max_size); *\/ */
+	/* } */
 	SSHBUF_DBG(("need %zu initial rlen %zu", need, rlen));
 
 	/* rlen might be above the max allocation */