Merge tag 'android-security-10.0.0_r53' into int/10/fp2
Android security 10.0.0 release 53
* tag 'android-security-10.0.0_r53':
Change-Id: If7cda8b386371e4c087bc47964bdd4afb11601b6
diff --git a/testcases/kernel/syscalls/sendmmsg/sendmmsg01.c b/testcases/kernel/syscalls/sendmmsg/sendmmsg01.c
index d1bdf40..ce100b2 100644
--- a/testcases/kernel/syscalls/sendmmsg/sendmmsg01.c
+++ b/testcases/kernel/syscalls/sendmmsg/sendmmsg01.c
@@ -5,6 +5,7 @@
#define _GNU_SOURCE
#include <netinet/ip.h>
+#include <semaphore.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -18,6 +19,8 @@
#define BUFSIZE 16
#define VLEN 2
+static sem_t send_sem;
+
static void *sender_thread(LTP_ATTRIBUTE_UNUSED void *arg)
{
struct sockaddr_in addr;
@@ -50,6 +53,8 @@
msg[1].msg_hdr.msg_iov = &msg2;
msg[1].msg_hdr.msg_iovlen = 1;
+ sem_wait(&send_sem);
+
retval = sendmmsg(send_sockfd, msg, 2, 0);
if (retval < 0)
tst_brk(TFAIL|TTERRNO, "sendmmsg failed");
@@ -74,6 +79,8 @@
addr.sin_port = htons(1234);
SAFE_BIND(receive_sockfd, (struct sockaddr *)&addr, sizeof(addr));
+ sem_post(&send_sem);
+
memset(msgs, 0, sizeof(msgs));
for (i = 0; i < VLEN; i++) {
iovecs[i].iov_base = bufs[i];
@@ -112,6 +119,8 @@
pthread_t sender;
pthread_t receiver;
+ sem_init(&send_sem, 0, 0);
+
SAFE_PTHREAD_CREATE(&sender, NULL, sender_thread, NULL);
SAFE_PTHREAD_CREATE(&receiver, NULL, receiver_thread, NULL);
SAFE_PTHREAD_JOIN(sender, NULL);
diff --git a/testcases/kernel/syscalls/statx/statx01.c b/testcases/kernel/syscalls/statx/statx01.c
index 23ea99b..5e705dc 100644
--- a/testcases/kernel/syscalls/statx/statx01.c
+++ b/testcases/kernel/syscalls/statx/statx01.c
@@ -92,7 +92,7 @@
buff.stx_mode, MODE);
- if (buff.stx_blocks <= buff.stx_blksize/512)
+ if (buff.stx_blocks <= 128)
tst_res(TPASS, "stx_blocks(%"PRIu64") is valid",
buff.stx_blocks);
else