11181172726

Committed 04 Oct 2024 01:49PM UTC coverage: 85.928% (+0.02%) from 85.91%

Build # 11181172726

Build Type

push

github

Committed by

locker

Commit Message

memtx: do not pass NULL to memcpy when creating gap item in MVCC

According to the C standard, passing `NULL` to `memcpy` is UB, even if
it copies nothing (number of bytes to copy is 0). The commit fixes such
situation in memtx MVCC.

Closes tarantool/security#129

NO_TEST=fix UB
NO_CHANGELOG=fix UB
NO_DOC=fix UB

(cherry picked from commit 24d38cef5)

Run Details

63079 of 114353 branches covered (55.16%)

2 of 2 new or added lines in 1 file covered. (100.0%)

22 existing lines in 12 files now uncovered.

93935 of 109318 relevant lines covered (85.93%)

2485302.84 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

85.71

/src/lib/core/tt_sigaction.c

/*
 * SPDX-License-Identifier: BSD-2-Clause
 *
 * Copyright 2010-2022, Tarantool AUTHORS, please see AUTHORS file.
 */
#include <assert.h>
#include <pthread.h>
#include <stdbool.h>
#include "tt_sigaction.h"

#define SIGMAX 32

/** Flag is set if main_thread_id variable is initialized. */
static bool main_thread_initialized;
/** Main thread id, it is set on first tt_sigaction call. */
static pthread_t main_thread_id;

static void (*sighandlers[SIGMAX])(int signum);

/**
 * Check that signal has been delivered to the main thread
 * and call signal handler or redirect it if thread is not main.
 */
static void
sighandler_dispatcher(int signum)
{
        if (!pthread_equal(pthread_self(), main_thread_id)) {
                pthread_kill(main_thread_id, signum);
                return;
        }
        assert(sighandlers[signum] != NULL);
        sighandlers[signum](signum);
}

int
tt_sigaction(int signum, struct sigaction *sa, struct sigaction *osa)
{
        assert(signum < SIGMAX);
        assert(sa != NULL);

        /* Memorize id of main thread at the first call. */
        if (!main_thread_initialized) {
                main_thread_id = pthread_self();
                main_thread_initialized = true;
        }

        void (*old_handler)(int) = sighandlers[signum];
        if (sa->sa_handler == SIG_DFL || sa->sa_handler == SIG_IGN) {
                sighandlers[signum] = NULL;
        } else {
                sighandlers[signum] = sa->sa_handler;
                sa->sa_handler = sighandler_dispatcher;
        }
        int rc = sigaction(signum, sa, osa);
        if (osa != NULL && old_handler != NULL)
                osa->sa_handler = old_handler;
        return rc;
}

1	/*
2	* SPDX-License-Identifier: BSD-2-Clause
3	*
4	* Copyright 2010-2022, Tarantool AUTHORS, please see AUTHORS file.
5	*/
6	#include <assert.h>
7	#include <pthread.h>
8	#include <stdbool.h>
9	#include "tt_sigaction.h"
10
11	#define SIGMAX 32
12
13	/** Flag is set if main_thread_id variable is initialized. */
14	static bool main_thread_initialized;
15	/** Main thread id, it is set on first tt_sigaction call. */
16	static pthread_t main_thread_id;
17
18	static void (*sighandlers[SIGMAX])(int signum);
19
20	/**
21	* Check that signal has been delivered to the main thread
22	* and call signal handler or redirect it if thread is not main.
23	*/
24	static void
25	sighandler_dispatcher(int signum)	1,417,970✔
26	{
27	if (!pthread_equal(pthread_self(), main_thread_id)) {	1,417,970!
UNCOV 28	pthread_kill(main_thread_id, signum);	×
UNCOV 29	return;	×
30	}
31	assert(sighandlers[signum] != NULL);	1,417,970!
32	sighandlers[signum](signum);	1,417,970✔
33	}
34
35	int
36	tt_sigaction(int signum, struct sigaction sa, struct sigaction osa)	8,205✔
37	{
38	assert(signum < SIGMAX);	8,205!
39	assert(sa != NULL);	8,205!
40
41	/* Memorize id of main thread at the first call. */
42	if (!main_thread_initialized) {	8,205✔
43	main_thread_id = pthread_self();	4,092✔
44	main_thread_initialized = true;	4,092✔
45	}
46
47	void (*old_handler)(int) = sighandlers[signum];	8,205✔
48	if (sa->sa_handler == SIG_DFL \|\| sa->sa_handler == SIG_IGN) {	8,205!
49	sighandlers[signum] = NULL;	12✔
50	} else {
51	sighandlers[signum] = sa->sa_handler;	8,193✔
52	sa->sa_handler = sighandler_dispatcher;	8,193✔
53	}
54	int rc = sigaction(signum, sa, osa);	8,205✔
55	if (osa != NULL && old_handler != NULL)	8,205!
56	osa->sa_handler = old_handler;	×
57	return rc;	8,205✔
58	}

tarantool / tarantool / 11181172726

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous