ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

snort: fix epoll_wait unsigned return value

Browse Source 
When epoll_wait return -1, access array epoll_events[i] out of bound
and lead to segmentation fault.

1. Change return value to signed return value
2. Skip non fatal error e.g. EINTR

Type: fix
Signed-off-by: Tianyu Li <tianyu.li@arm.com>
Change-Id: I4ece118999402ec6054baf0efb52419151655def
This commit is contained in:
Tianyu Li
2021-09-08 13:52:55 +08:00
committed by Damjan Marion
parent 596c45b222
commit 006bbc4945
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/snort/daq_vpp.c
View File

@ -562,7 +562,8 @@ vpp_daq_msg_receive (void *handle, const unsigned max_recv,
{
VPP_Context_t *vc = (VPP_Context_t *) handle;
uint32_t n_qpairs_left = vc->num_qpairs;
uint32_t n, n_events, n_recv = 0;
uint32_t n, n_recv = 0;
int32_t n_events;
/* If the receive has been interrupted, break out of loop and return. */
if (vc->interrupted)
@ -606,9 +607,14 @@ vpp_daq_msg_receive (void *handle, const unsigned max_recv,
n_events = epoll_wait (vc->epoll_fd, vc->epoll_events, vc->num_qpairs, 1000);
if (n_events < 1)
if (n_events == 0)
{
*rstat = n_events == -1 ? DAQ_RSTAT_ERROR : DAQ_RSTAT_TIMEOUT;
*rstat = DAQ_RSTAT_TIMEOUT;
return 0;
}
if (n_events < 0)
{
*rstat = errno == EINTR ? DAQ_RSTAT_TIMEOUT : DAQ_RSTAT_ERROR;
return 0;
}