proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-06 14:29:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: fix uninitialized & wrong endian NOTIFY

Browse Source 
notify_data_remote_as4 would contain garbage if optlen == 0, and also
as4 is in host byte order while the notify needs network byte order.

Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
David Lamparter 2019-06-12 23:17:26 +02:00
parent ed4e30ede4
commit 6dcef54cbf
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bgpd/bgp_packet.c
View File

@ -1045,7 +1045,7 @@ static int bgp_open_receive(struct peer *peer, bgp_size_t size)
uint16_t holdtime; uint16_t holdtime;
uint16_t send_holdtime; uint16_t send_holdtime;
as_t remote_as; as_t remote_as;
as_t as4 = 0; as_t as4 = 0, as4_be;
struct in_addr remote_id; struct in_addr remote_id;
int mp_capability; int mp_capability;
uint8_t notify_data_remote_as[2]; uint8_t notify_data_remote_as[2];
@ -1088,9 +1088,11 @@ static int bgp_open_receive(struct peer *peer, bgp_size_t size)
* that we do not know which peer is connecting to us now. * that we do not know which peer is connecting to us now.
*/ */
as4 = peek_for_as4_capability(peer, optlen); as4 = peek_for_as4_capability(peer, optlen);
memcpy(notify_data_remote_as4, &as4, 4);
} }
as4_be = htonl(as4);
memcpy(notify_data_remote_as4, &as4_be, 4);
/* Just in case we have a silly peer who sends AS4 capability set to 0 /* Just in case we have a silly peer who sends AS4 capability set to 0
*/ */
if (CHECK_FLAG(peer->cap, PEER_CAP_AS4_RCV) && !as4) { if (CHECK_FLAG(peer->cap, PEER_CAP_AS4_RCV) && !as4) {