mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-29 13:28:27 +00:00
Code Issues Releases Wiki Activity

zdtm/sigpending/32: check only 12 bytes of _si_fields

Browse Source 
The kernel does touch only relevant union member on x86_32.

travis-ci: success for zdtm/sigpending/32: check only 12 bytes of _si_fields
Cc: Andrei Vagin <avagin@virtuozzo.com>
Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Dmitry Safonov 2017-01-20 18:49:00 +03:00 committed by Andrei Vagin
parent a84e65a63b
commit 1aea2b98d8
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/zdtm/static/sigpending.c
View File

@ -29,6 +29,26 @@ static int thread_nr;
# define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) # define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
#endif #endif
#ifdef __i386__
/*
* On x86_32 kernel puts only relevant union member when signal arrives,
* leaving _si_fields to be filled with junk from stack. Check only
* first 12 bytes:
* // POSIX.1b signals.
* struct
* {
* __pid_t si_pid; // Sending process ID.
* __uid_t si_uid; // Real user ID of sending process.
* sigval_t si_sigval; // Signal value.
* } _rt;
* Look at __copy_siginfo_to_user32() for more information.
*/
# define _si_fields_sz 12
#else
# define _si_fields_sz (sizeof(siginfo_t) - offsetof(siginfo_t, _sifields))
#endif
#define siginfo_filled (offsetof(siginfo_t, _sifields) + _si_fields_sz)
static pthread_mutex_t exit_lock; static pthread_mutex_t exit_lock;
static pthread_mutex_t init_lock; static pthread_mutex_t init_lock;
@ -71,13 +91,12 @@ static void sig_handler(int signal, siginfo_t *info, void *data)
} }
crc = ~0; crc = ~0;
if (datachk((uint8_t *) &info->_sifields, if (datachk((uint8_t *) &info->_sifields, _si_fields_sz, &crc)) {
sizeof(siginfo_t) - offsetof(siginfo_t, _sifields), &crc)) {
fail("CRC mismatch\n"); fail("CRC mismatch\n");
return; return;
} }
if (memcmp(info, src, sizeof(siginfo_t))) { if (memcmp(info, src, siginfo_filled)) {
fail("Source and received info are differ\n"); fail("Source and received info are differ\n");
return; return;
} }
@ -154,8 +173,7 @@ int send_siginfo(int signo, pid_t pid, pid_t tid, int group, siginfo_t *info)
info->si_code = si_code; info->si_code = si_code;
si_code--; si_code--;
info->si_signo = signo; info->si_signo = signo;
datagen((uint8_t *) &info->_sifields, datagen((uint8_t *) &info->_sifields, _si_fields_sz, &crc);
sizeof(siginfo_t) - offsetof(siginfo_t, _sifields), &crc);
sent_sigs++; sent_sigs++;