diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-06-30 13:57:01 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-06-30 13:57:01 +0300 |
| commit | dfe933b7227e91533200981cbc4a2ee51a5f5e51 (patch) | |
| tree | 4b5a42d3a57e73306a66a06de34b41611a92ec58 /main/quagga/0004-bgpd-fix-memory-leak-on-malformed-attribute.patch | |
| parent | db7f405e94e690b550f70f4a1c7a8681d167f904 (diff) | |
| download | aports-dfe933b7227e91533200981cbc4a2ee51a5f5e51.tar.bz2 aports-dfe933b7227e91533200981cbc4a2ee51a5f5e51.tar.xz | |
main/quagga: cherry-pick bgp fixes from 0.99.23-stable branch
Diffstat (limited to 'main/quagga/0004-bgpd-fix-memory-leak-on-malformed-attribute.patch')
| -rw-r--r-- | main/quagga/0004-bgpd-fix-memory-leak-on-malformed-attribute.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/main/quagga/0004-bgpd-fix-memory-leak-on-malformed-attribute.patch b/main/quagga/0004-bgpd-fix-memory-leak-on-malformed-attribute.patch new file mode 100644 index 0000000000..2288d9fbef --- /dev/null +++ b/main/quagga/0004-bgpd-fix-memory-leak-on-malformed-attribute.patch @@ -0,0 +1,33 @@ +From f80f838b2f54738937ef1281b237710132195c44 Mon Sep 17 00:00:00 2001 +From: David Lamparter <equinox@opensourcerouting.org> +Date: Wed, 4 Jun 2014 01:00:51 +0200 +Subject: [PATCH] bgpd: fix memory leak on malformed attribute + +When bgp_attr_parse returns BGP_ATTR_PARSE_ERROR, it may already have +parsed and allocated some attributes before hitting that error. Free +the attr's data before returning. + +Signed-off-by: David Lamparter <equinox@opensourcerouting.org> +--- + bgpd/bgp_packet.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c +index 80651f1..65c6cac 100644 +--- a/bgpd/bgp_packet.c ++++ b/bgpd/bgp_packet.c +@@ -1720,7 +1720,10 @@ bgp_update_receive (struct peer *peer, bgp_size_t size) + attr_parse_ret = bgp_attr_parse (peer, &attr, attribute_len, + &mp_update, &mp_withdraw); + if (attr_parse_ret == BGP_ATTR_PARSE_ERROR) +- return -1; ++ { ++ bgp_attr_unintern_sub (&attr); ++ return -1; ++ } + } + + /* Logging the attribute. */ +-- +2.0.1 + |