diff options
| author |   Kai Kang <kai.kang@windriver.com> | 2014-04-21 14:24:50 +0800 |
|---|---|---|
| committer |   Joe MacDonald <joe@deserted.net> | 2014-04-24 21:07:46 -0400 |
| commit | 715893e5ffcce8d32f096c93dd36f345e52c17a7 (patch) | |
| tree | 249ff92f63e35567f2394ef851dde66dbfb0aec9 /meta-networking | |
| parent | a277f303df123e050a98729415fed6a2590e7f76 (diff) | |
| download | meta-openembedded-contrib-715893e5ffcce8d32f096c93dd36f345e52c17a7.tar.gz | |
quagga: fix CVE-2013-6051
Backport patch to fix CVE-2013-6051.
Signed-off-by: Hu <yadi.hu@windriver.com>
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-protocols/quagga/files/quagga-fix-CVE-2013-6051.patch | 29 | ||||
| -rw-r--r-- | meta-networking/recipes-protocols/quagga/quagga.inc | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/meta-networking/recipes-protocols/quagga/files/quagga-fix-CVE-2013-6051.patch b/meta-networking/recipes-protocols/quagga/files/quagga-fix-CVE-2013-6051.patch new file mode 100644 index 0000000000..fde9e0ca81 --- /dev/null +++ b/meta-networking/recipes-protocols/quagga/files/quagga-fix-CVE-2013-6051.patch @@ -0,0 +1,29 @@ + +From 8794e8d229dc9fe29ea31424883433d4880ef408 +From: Paul Jakma <paul@quagga.net> +Date: Mon, 13 Feb 2012 13:53:07 +0000 +Subject: bgpd: Fix regression in args consolidation, total should be inited from args + +bgpd: Fix regression in args consolidation, total should be inited from args + +* bgp_attr.c: (bgp_attr_unknown) total should be initialised from the args. + +Upstream-Status: Backport + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + +diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c +index 65af824..839f64d 100644 +--- a/bgpd/bgp_attr.c ++++ b/bgpd/bgp_attr.c + +@@ -1646,7 +1646,7 @@ + static bgp_attr_parse_ret_t + bgp_attr_unknown (struct bgp_attr_parser_args *args) + { +- bgp_size_t total; ++ bgp_size_t total = args->total; + struct transit *transit; + struct attr_extra *attre; + struct peer *const peer = args->peer; diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc index f043725be8..60baab8011 100644 --- a/meta-networking/recipes-protocols/quagga/quagga.inc +++ b/meta-networking/recipes-protocols/quagga/quagga.inc @@ -26,6 +26,7 @@ QUAGGASUBDIR = "" SRC_URI = "http://download.savannah.gnu.org/releases/quagga${QUAGGASUBDIR}/quagga-${PV}.tar.gz;name=quagga-${PV} \ file://fix-for-lib-inpath.patch \ file://quagga-0.99.17-libcap.patch \ + file://quagga-fix-CVE-2013-6051.patch \ file://Zebra-sync-zebra-routing-table-with-the-kernel-one.patch \ file://quagga.init \ file://quagga.default \ |