gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-23 16:49:10 -07:00
Code Issues Projects Releases Wiki Activity

net-misc/quagga: revision bump

Browse Source 
Fix NULL pointer dereference in ripd
Commited straight to stable

Reported-by: Sebastian Kricner <sebastian.kricner@tuxwave.net>
Acked-by: Sergey Popov <pinkbyte@gentoo.org>
Gentoo-Bug: 579386

Package-Manager: portage-2.2.28
RepoMan-Options: --force
This commit is contained in:
Sergey Popov
2016-04-12 16:02:00 +03:00
parent 85ba7b28c5
commit ca6d97524c
2 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
net-misc/quagga/files/quagga-1.0.20160315-ripd-null-pointer-fix.patch Normal file
View File

@@ -0,0 +1,40 @@
The rip_output_process function dereferenced a NULL
pointer. Core file examination showed that tmp_rinfo
was NULL on line 2435. Looking at the last diff
associated with this commit, it was obvious that
a formating mistake had been made in the loop over
the route nodes list of possible paths.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reported-by: Sebastian Kricner <sebastian.kricner@tuxwave.net>
---
ripd/ripd.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/ripd/ripd.c b/ripd/ripd.c
index 82b1ada..0beb0e6 100644
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -2429,12 +2429,14 @@ rip_output_process (struct connected *ifc, struct sockaddr_in *to,
struct rip_info *tmp_rinfo = NULL;
for (ALL_LIST_ELEMENTS_RO (list, listnode, tmp_rinfo))
- if (tmp_rinfo->type == ZEBRA_ROUTE_RIP &&
- tmp_rinfo->ifindex == ifc->ifp->ifindex)
- rinfo->metric_out = RIP_METRIC_INFINITY;
- if (tmp_rinfo->type == ZEBRA_ROUTE_CONNECT &&
- prefix_match((struct prefix *)p, ifc->address))
- rinfo->metric_out = RIP_METRIC_INFINITY;
+ {
+ if (tmp_rinfo->type == ZEBRA_ROUTE_RIP &&
+ tmp_rinfo->ifindex == ifc->ifp->ifindex)
+ rinfo->metric_out = RIP_METRIC_INFINITY;
+ if (tmp_rinfo->type == ZEBRA_ROUTE_CONNECT &&
+ prefix_match((struct prefix *)p, ifc->address))
+ rinfo->metric_out = RIP_METRIC_INFINITY;
+ }
}
/* Prepare preamble, auth headers, if needs be */
--
1.9.1

5
net-misc/quagga/quagga-1.0.20160315.ebuild → net-misc/quagga/quagga-1.0.20160315-r1.ebuild
View File

@@ -34,7 +34,10 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
sys-apps/iproute2"
PATCHES=( "${FILESDIR}/${PN}-0.99.22.4-ipctl-forwarding.patch" )
PATCHES=(
"${FILESDIR}/${PN}-0.99.22.4-ipctl-forwarding.patch"
"${FILESDIR}/${PN}-1.0.20160315-ripd-null-pointer-fix.patch"
)
DISABLE_AUTOFORMATTING=1
DOC_CONTENTS="Sample configuration files can be found in /usr/share/doc/${PF}/samples