Skip to content

Commit cea3bfb

Browse files
nxa22042davem330
authored andcommitted
selftests/tls: Fix recv partial/large_buff test cases
TLS test cases recv_partial & recv_peek_large_buf_mult_recs expect to receive a certain amount of data and then compare it against known strings using memcmp. To prevent recvmsg() from returning lesser than expected number of bytes (compared in memcmp), MSG_WAITALL needs to be passed in recvmsg(). Signed-off-by: Vakul Garg <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 13d0ab6 commit cea3bfb

File tree

1 file changed

+7
-5
lines changed
  • tools/testing/selftests/net

1 file changed

+7
-5
lines changed

tools/testing/selftests/net/tls.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -452,10 +452,12 @@ TEST_F(tls, recv_partial)
452452

453453
memset(recv_mem, 0, sizeof(recv_mem));
454454
EXPECT_EQ(send(self->fd, test_str, send_len, 0), send_len);
455-
EXPECT_NE(recv(self->cfd, recv_mem, strlen(test_str_first), 0), -1);
455+
EXPECT_NE(recv(self->cfd, recv_mem, strlen(test_str_first),
456+
MSG_WAITALL), -1);
456457
EXPECT_EQ(memcmp(test_str_first, recv_mem, strlen(test_str_first)), 0);
457458
memset(recv_mem, 0, sizeof(recv_mem));
458-
EXPECT_NE(recv(self->cfd, recv_mem, strlen(test_str_second), 0), -1);
459+
EXPECT_NE(recv(self->cfd, recv_mem, strlen(test_str_second),
460+
MSG_WAITALL), -1);
459461
EXPECT_EQ(memcmp(test_str_second, recv_mem, strlen(test_str_second)),
460462
0);
461463
}
@@ -565,10 +567,10 @@ TEST_F(tls, recv_peek_large_buf_mult_recs)
565567
len = strlen(test_str_second) + 1;
566568
EXPECT_EQ(send(self->fd, test_str_second, len, 0), len);
567569

568-
len = sizeof(buf);
570+
len = strlen(test_str) + 1;
569571
memset(buf, 0, len);
570-
EXPECT_NE(recv(self->cfd, buf, len, MSG_PEEK), -1);
571-
572+
EXPECT_NE((len = recv(self->cfd, buf, len,
573+
MSG_PEEK | MSG_WAITALL)), -1);
572574
len = strlen(test_str) + 1;
573575
EXPECT_EQ(memcmp(test_str, buf, len), 0);
574576
}

0 commit comments

Comments
 (0)