proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-31 00:10:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1645 from qlyoung/fix-cancel-invalid-rw

Browse Source 
lib: avoid crash when cancelling invalid rw job
This commit is contained in:
Jafar Al-Gharaibeh 2018-01-18 09:37:24 -06:00 committed by GitHub
commit 9ee9eb8066
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/thread.c
View File

@ -919,6 +919,8 @@ struct thread *funcname_thread_add_event(struct thread_master *m,
*/ */
static void thread_cancel_rw(struct thread_master *master, int fd, short state) static void thread_cancel_rw(struct thread_master *master, int fd, short state)
{ {
bool found = false;
/* Cancel POLLHUP too just in case some bozo set it */ /* Cancel POLLHUP too just in case some bozo set it */
state |= POLLHUP; state |= POLLHUP;
@ -926,8 +928,18 @@ static void thread_cancel_rw(struct thread_master *master, int fd, short state)
nfds_t i; nfds_t i;
for (i = 0; i < master->handler.pfdcount; i++) for (i = 0; i < master->handler.pfdcount; i++)
if (master->handler.pfds[i].fd == fd) if (master->handler.pfds[i].fd == fd) {
found = true;
break; break;
}
if (!found) {
zlog_debug(
"[!] Received cancellation request for nonexistent rw job");
zlog_debug("[!] threadmaster: %s | fd: %d",
master->name ? master->name : "", fd);
return;
}
/* NOT out event. */ /* NOT out event. */
master->handler.pfds[i].events &= ~(state); master->handler.pfds[i].events &= ~(state);