svn commit: r556630 - in head/net/frr7: . files

[Olivier Cochard]

Author: olivier
Date: Mon Nov 30 11:57:08 2020
New Revision: 556630
URL: https://svnweb.freebsd.org/changeset/ports/556630

Log:
  Prevent crash by accessing memory not owned by ospfd.
  
  Reported by:	Thomas Hilse <thomas.hilse at cert-bund.de>

Added:
  head/net/frr7/files/patch-ospfd_ospf__routemap.c   (contents, props changed)
Modified:
  head/net/frr7/Makefile

Modified: head/net/frr7/Makefile
==============================================================================
--- head/net/frr7/Makefile	Mon Nov 30 11:37:51 2020	(r556629)
+++ head/net/frr7/Makefile	Mon Nov 30 11:57:08 2020	(r556630)
@@ -3,6 +3,7 @@
 PORTNAME=	frr
 PORTVERSION=	7.5
 DISTVERSIONPREFIX=	frr-
+PORTREVISION=	1
 CATEGORIES=	net
 .if defined(PYTHONTOOLS)
 PKGNAMESUFFIX=	7-pythontools

Added: head/net/frr7/files/patch-ospfd_ospf__routemap.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/frr7/files/patch-ospfd_ospf__routemap.c	Mon Nov 30 11:57:08 2020	(r556630)
@@ -0,0 +1,11 @@
+--- ospfd/ospf_routemap.c.orig	2020-11-30 11:26:58 UTC
++++ ospfd/ospf_routemap.c
+@@ -445,7 +445,7 @@ static void *route_set_metric_compile(const char *arg)
+ {
+ 	struct ospf_metric *metric;
+ 
+-	metric = XCALLOC(MTYPE_ROUTE_MAP_COMPILED, sizeof(uint32_t));
++	metric = XCALLOC(MTYPE_ROUTE_MAP_COMPILED, sizeof(*metric));
+ 	metric->used = false;
+ 
+ 	if (all_digit(arg))