Skip to content

Commit

Permalink
Problem: zmq_poller_[add/modify] accept invalid events arguments sile…
Browse files Browse the repository at this point in the history 
…ntly

Solution: check and return an error on invalid arguments. Fixes zeromq#3088
  • Loading branch information
@sigiesec
sigiesec committed May 14, 2018
1 parent 6b9b369 commit 1b1a61f
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 4 deletions.
19 changes: 15 additions & 4 deletions src/zmq.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1197,6 +1197,13 @@ static int check_poller (void *const poller_)
return 0;
}

static int check_events (const short events_)
{
return (events_ & ~(ZMQ_POLLIN | ZMQ_POLLOUT | ZMQ_POLLERR | ZMQ_POLLPRI))
? -1
: 0;
}

static int check_poller_registration_args (void *const poller_, void *const s_)
{
if (-1 == check_poller (poller_))
Expand Down Expand Up @@ -1231,7 +1238,8 @@ static int check_poller_fd_registration_args (void *const poller_,

int zmq_poller_add (void *poller_, void *s_, void *user_data_, short events_)
{
if (-1 == check_poller_registration_args (poller_, s_))
if (-1 == check_poller_registration_args (poller_, s_)
|| -1 == check_events (events_))
return -1;

zmq::socket_base_t *socket = (zmq::socket_base_t *) s_;
Expand All @@ -1249,7 +1257,8 @@ int zmq_poller_add_fd (void *poller_,
int zmq_poller_add_fd (void *poller_, int fd_, void *user_data_, short events_)
#endif
{
if (-1 == check_poller_fd_registration_args (poller_, fd_))
if (-1 == check_poller_fd_registration_args (poller_, fd_)
|| -1 == check_events (events_))
return -1;

return ((zmq::socket_poller_t *) poller_)
Expand All @@ -1259,7 +1268,8 @@ int zmq_poller_add_fd (void *poller_, int fd_, void *user_data_, short events_)

int zmq_poller_modify (void *poller_, void *s_, short events_)
{
if (-1 == check_poller_registration_args (poller_, s_))
if (-1 == check_poller_registration_args (poller_, s_)
|| -1 == check_events (events_))
return -1;

zmq::socket_base_t *socket = (zmq::socket_base_t *) s_;
Expand All @@ -1274,7 +1284,8 @@ int zmq_poller_modify_fd (void *poller_, SOCKET fd_, short events_)
int zmq_poller_modify_fd (void *poller_, int fd_, short events_)
#endif
{
if (-1 == check_poller_fd_registration_args (poller_, fd_))
if (-1 == check_poller_fd_registration_args (poller_, fd_)
|| -1 == check_events (events_))
return -1;

return ((zmq::socket_poller_t *) poller_)->modify_fd (fd_, events_);
Expand Down
50 changes: 50 additions & 0 deletions tests/test_poller.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include "testutil_unity.hpp"

#include <unity.h>
#include <limits.h>

void setUp ()
{
Expand Down Expand Up @@ -393,6 +394,42 @@ void call_poller_modify_fd_unregistered_fails (void *poller,
TEST_ASSERT_SUCCESS_ERRNO (close (plain_socket));
}

void call_poller_add_invalid_events_fails (void *poller, void *zeromq_socket)
{
TEST_ASSERT_FAILURE_ERRNO (
EINVAL, zmq_poller_add (poller, zeromq_socket, NULL, SHRT_MAX));
}

void call_poller_modify_invalid_events_fails (void *poller, void *zeromq_socket)
{
TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_add (poller, zeromq_socket, NULL, 0));

TEST_ASSERT_FAILURE_ERRNO (
EINVAL, zmq_poller_modify (poller, zeromq_socket, SHRT_MAX));
}

void call_poller_add_fd_invalid_events_fails (void *poller,
void * /*zeromq_socket*/)
{
fd_t plain_socket = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
TEST_ASSERT_FAILURE_ERRNO (
EINVAL, zmq_poller_add_fd (poller, plain_socket, NULL, SHRT_MAX));

TEST_ASSERT_SUCCESS_ERRNO (close (plain_socket));
}

void call_poller_modify_fd_invalid_events_fails (void *poller,
void * /*zeromq_socket*/)
{
fd_t plain_socket = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
TEST_ASSERT_SUCCESS_ERRNO (
zmq_poller_add_fd (poller, plain_socket, NULL, 0));
TEST_ASSERT_FAILURE_ERRNO (
EINVAL, zmq_poller_modify_fd (poller, plain_socket, SHRT_MAX));

TEST_ASSERT_SUCCESS_ERRNO (close (plain_socket));
}

TEST_CASE_FUNC_PARAM (call_poller_add_twice_fails, test_with_empty_poller)
TEST_CASE_FUNC_PARAM (call_poller_remove_unregistered_fails,
test_with_empty_poller)
Expand All @@ -406,6 +443,15 @@ TEST_CASE_FUNC_PARAM (call_poller_remove_fd_unregistered_fails,
TEST_CASE_FUNC_PARAM (call_poller_modify_fd_unregistered_fails,
test_with_empty_poller)

TEST_CASE_FUNC_PARAM (call_poller_add_invalid_events_fails,
test_with_empty_poller)
TEST_CASE_FUNC_PARAM (call_poller_modify_invalid_events_fails,
test_with_empty_poller)
TEST_CASE_FUNC_PARAM (call_poller_add_fd_invalid_events_fails,
test_with_empty_poller)
TEST_CASE_FUNC_PARAM (call_poller_modify_fd_invalid_events_fails,
test_with_empty_poller)

void call_poller_wait_empty_with_timeout_fails (void *poller, void * /*socket*/)
{
zmq_poller_event_t event;
Expand Down Expand Up @@ -618,6 +664,10 @@ int main (void)
RUN_TEST (test_call_poller_add_fd_twice_fails);
RUN_TEST (test_call_poller_remove_fd_unregistered_fails);
RUN_TEST (test_call_poller_modify_fd_unregistered_fails);
RUN_TEST (test_call_poller_add_invalid_events_fails);
RUN_TEST (test_call_poller_modify_invalid_events_fails);
RUN_TEST (test_call_poller_add_fd_invalid_events_fails);
RUN_TEST (test_call_poller_modify_fd_invalid_events_fails);

RUN_TEST (test_call_poller_wait_empty_with_timeout_fails);
RUN_TEST (test_call_poller_wait_empty_without_timeout_fails);
Expand Down

0 comments on commit 1b1a61f

Please sign in to comment.