cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-08-05 10:16:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'official/pr/804'

Browse Source 
* official/pr/804:
  Added test for evmap slot validations.
  Prevent endless loop in evmap_make_space.
  Enforce limit of NSIG signals.

(cherry picked from commit c6becb26cad8dab2668fe3d913e5ee757bade2fd)
This commit is contained in:
Azat Khuzhin 2019-04-30 08:43:27 +03:00
parent 0b46bb8cc9
commit 87fa93a8e6
No known key found for this signature in database
GPG Key ID: B86086848EF8686D
2 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
evmap.c
View File

@ -43,6 +43,7 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <errno.h> #include <errno.h>
#include <limits.h>
#include <signal.h> #include <signal.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
@ -207,9 +208,15 @@ evmap_make_space(struct event_signal_map *map, int slot, int msize)
int nentries = map->nentries ? map->nentries : 32; int nentries = map->nentries ? map->nentries : 32;
void **tmp; void **tmp;
if (slot > INT_MAX / 2)
return (-1);
while (nentries <= slot) while (nentries <= slot)
nentries <<= 1; nentries <<= 1;
if (nentries > INT_MAX / msize)
return (-1);
tmp = (void **)mm_realloc(map->entries, nentries * msize); tmp = (void **)mm_realloc(map->entries, nentries * msize);
if (tmp == NULL) if (tmp == NULL)
return (-1); return (-1);
@ -446,6 +453,9 @@ evmap_signal_add_(struct event_base *base, int sig, struct event *ev)
struct event_signal_map *map = &base->sigmap; struct event_signal_map *map = &base->sigmap;
struct evmap_signal *ctx = NULL; struct evmap_signal *ctx = NULL;
if (sig < 0 || sig >= NSIG)
return (-1);
if (sig >= map->nentries) { if (sig >= map->nentries) {
if (evmap_make_space( if (evmap_make_space(
map, sig, sizeof(struct evmap_signal *)) == -1) map, sig, sizeof(struct evmap_signal *)) == -1)
@ -472,7 +482,7 @@ evmap_signal_del_(struct event_base *base, int sig, struct event *ev)
struct event_signal_map *map = &base->sigmap; struct event_signal_map *map = &base->sigmap;
struct evmap_signal *ctx; struct evmap_signal *ctx;
if (sig >= map->nentries) if (sig < 0 || sig >= map->nentries)
return (-1); return (-1);
GET_SIGNAL_SLOT(ctx, map, sig, evmap_signal); GET_SIGNAL_SLOT(ctx, map, sig, evmap_signal);

42
test/regress.c
View File

@ -46,6 +46,7 @@
#ifndef _WIN32 #ifndef _WIN32
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <limits.h>
#include <signal.h> #include <signal.h>
#include <unistd.h> #include <unistd.h>
#include <netdb.h> #include <netdb.h>
@ -3303,6 +3304,46 @@ tabf_cb(evutil_socket_t fd, short what, void *arg)
*ptr += 0x10000; *ptr += 0x10000;
} }
static void
test_evmap_invalid_slots(void *arg)
{
struct basic_test_data *data = arg;
struct event_base *base = data->base;
struct event *ev1 = NULL, *ev2 = NULL;
int e1, e2;
#ifndef _WIN32
struct event *ev3 = NULL, *ev4 = NULL;
int e3, e4;
#endif
ev1 = evsignal_new(base, -1, dummy_read_cb, (void *)base);
ev2 = evsignal_new(base, NSIG, dummy_read_cb, (void *)base);
tt_assert(ev1);
tt_assert(ev2);
e1 = event_add(ev1, NULL);
e2 = event_add(ev2, NULL);
tt_int_op(e1, !=, 0);
tt_int_op(e2, !=, 0);
#ifndef _WIN32
ev3 = event_new(base, INT_MAX, EV_READ, dummy_read_cb, (void *)base);
ev4 = event_new(base, INT_MAX / 2, EV_READ, dummy_read_cb, (void *)base);
tt_assert(ev3);
tt_assert(ev4);
e3 = event_add(ev3, NULL);
e4 = event_add(ev4, NULL);
tt_int_op(e3, !=, 0);
tt_int_op(e4, !=, 0);
#endif
end:
event_free(ev1);
event_free(ev2);
#ifndef _WIN32
event_free(ev3);
event_free(ev4);
#endif
}
static void static void
test_active_by_fd(void *arg) test_active_by_fd(void *arg)
{ {
@ -3402,6 +3443,7 @@ struct testcase_t main_testcases[] = {
BASIC(event_assign_selfarg, TT_FORK|TT_NEED_BASE), BASIC(event_assign_selfarg, TT_FORK|TT_NEED_BASE),
BASIC(event_base_get_num_events, TT_FORK|TT_NEED_BASE), BASIC(event_base_get_num_events, TT_FORK|TT_NEED_BASE),
BASIC(event_base_get_max_events, TT_FORK|TT_NEED_BASE), BASIC(event_base_get_max_events, TT_FORK|TT_NEED_BASE),
BASIC(evmap_invalid_slots, TT_FORK|TT_NEED_BASE),
BASIC(bad_assign, TT_FORK|TT_NEED_BASE|TT_NO_LOGS), BASIC(bad_assign, TT_FORK|TT_NEED_BASE|TT_NO_LOGS),
BASIC(bad_reentrant, TT_FORK|TT_NEED_BASE|TT_NO_LOGS), BASIC(bad_reentrant, TT_FORK|TT_NEED_BASE|TT_NO_LOGS),