Mbed-TLS/mbedtls-framework
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls-framework.git synced 2026-10-01 22:37:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix reading of child output when it's fragmented

Browse Source 
In the success case, we were only reporting the correct data written by the
child if the data was read in a single `read` call.

Signed-off-by: Gilles Peskine <[email protected]>
This commit is contained in:
Gilles Peskine
2026-03-16 15:53:57 +01:00
parent 96c9dca216
commit f7df78d3ab
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/fork_helpers.c
+11 -11
View File
@@ -128,29 +128,29 @@ int mbedtls_test_fork_run_child(
/* Tentatively read what we were promised. Don't commit to anything /* Tentatively read what we were promised. Don't commit to anything
* until we have the child's exit status. */ * until we have the child's exit status. */
size_t offset = 0; size_t bytes_read = 0;
if (result_char == MBEDTLS_TEST_RESULT_SUCCESS) { if (result_char == MBEDTLS_TEST_RESULT_SUCCESS) {
do { do {
n = read(pipe_fd[0], n = read(pipe_fd[0],
child_output + offset, child_output + bytes_read,
child_output_size - offset); child_output_size - bytes_read);
if (n > 0) { if (n > 0) {
offset += n; bytes_read += n;
} }
} while (n > 0 && offset < child_output_size); } while (n > 0 && bytes_read < child_output_size);
TEST_ASSERT_ERRNO(n != -1); TEST_ASSERT_ERRNO(n != -1);
} else { } else {
do { do {
n = read(pipe_fd[0], n = read(pipe_fd[0],
(unsigned char *) &reading_on_failure + offset, (unsigned char *) &reading_on_failure + bytes_read,
sizeof(reading_on_failure) - offset); sizeof(reading_on_failure) - bytes_read);
if (n > 0) { if (n > 0) {
offset += n; bytes_read += n;
} }
} while (n > 0 && offset < sizeof(reading_on_failure)); } while (n > 0 && bytes_read < sizeof(reading_on_failure));
TEST_ASSERT_ERRNO(n != -1); TEST_ASSERT_ERRNO(n != -1);
/* Check that the child wrote the amount of data that what we expect. */ /* Check that the child wrote the amount of data that what we expect. */
TEST_EQUAL(offset, sizeof(reading_on_failure.child_test_info)); TEST_EQUAL(bytes_read, sizeof(reading_on_failure.child_test_info));
} }
/* Close the pipe. If we left it open, there could be a deadlock if the /* Close the pipe. If we left it open, there could be a deadlock if the
@@ -163,7 +163,7 @@ int mbedtls_test_fork_run_child(
TEST_ASSERT_ERRNO(waitpid(pid, &wstatus, 0) == pid); TEST_ASSERT_ERRNO(waitpid(pid, &wstatus, 0) == pid);
if (WIFEXITED(wstatus) && WEXITSTATUS(wstatus) == CHILD_EXIT_CODE_OK) { if (WIFEXITED(wstatus) && WEXITSTATUS(wstatus) == CHILD_EXIT_CODE_OK) {
if (result_char == MBEDTLS_TEST_RESULT_SUCCESS) { if (result_char == MBEDTLS_TEST_RESULT_SUCCESS) {
*child_output_length = n; *child_output_length = bytes_read;
ret = 0; ret = 0;
} else { } else {
mbedtls_test_info_overwrite(&reading_on_failure.child_test_info); mbedtls_test_info_overwrite(&reading_on_failure.child_test_info);