proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-15 06:45:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1508 from qlyoung/bgpd-fix-lock

Browse Source 
bgpd: fix potential deadlock
This commit is contained in:
Rafael Zalamena 2017-12-04 11:16:45 -02:00 committed by GitHub
commit 6bbda63df7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bgpd/bgp_packet.c
View File

@ -556,12 +556,14 @@ static int bgp_write_notify(struct peer *peer)
{ {
/* There should be at least one packet. */ /* There should be at least one packet. */
s = stream_fifo_pop(peer->obuf); s = stream_fifo_pop(peer->obuf);
if (!s)
return 0;
assert(stream_get_endp(s) >= BGP_HEADER_SIZE);
} }
pthread_mutex_unlock(&peer->io_mtx); pthread_mutex_unlock(&peer->io_mtx);
if (!s)
return 0;
assert(stream_get_endp(s) >= BGP_HEADER_SIZE);
/* Stop collecting data within the socket */ /* Stop collecting data within the socket */
sockopt_cork(peer->fd, 0); sockopt_cork(peer->fd, 0);