Resolves: #1983967 - ospfd crashes in route_node_delete with assertion fail
This commit is contained in:
Michal Ruprich
parent
e91052f0d7
commit
6bc5a6f280
|
|
@ -0,0 +1,108 @@
|
||||||
|
From 4f08c715db6893ff439d0a39bf4506cd26256d13 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Igor Ryzhov <iryzhov@nfware.com>
|
||||||
|
Date: Fri, 18 Jun 2021 13:06:13 +0300
|
||||||
|
Subject: [PATCH] lib: remove pure attribute from functions that modify memory
|
||||||
|
|
||||||
|
Almost all functions currently marked with pure attribute acquire a
|
||||||
|
route_node lock. By marking them pure we allow compiler to optimize the
|
||||||
|
code and not call them when it already knows the return value. This is
|
||||||
|
completely incorrect.
|
||||||
|
|
||||||
|
Only two of eleven functions can be marked as pure. And they still won't
|
||||||
|
be optimized because they are never called from the same function twice.
|
||||||
|
Let's remove the ext_pure macro completely to reduce the chance of
|
||||||
|
repeating this mistake in the future.
|
||||||
|
|
||||||
|
Fixes #8866, #8809, #8595, #6992.
|
||||||
|
|
||||||
|
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
|
||||||
|
---
|
||||||
|
lib/compiler.h | 9 ---------
|
||||||
|
lib/table.h | 44 ++++++++++++++++++++------------------------
|
||||||
|
2 files changed, 20 insertions(+), 33 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lib/compiler.h b/lib/compiler.h
|
||||||
|
index bbfe01b569c..e805eb8be48 100644
|
||||||
|
--- a/lib/compiler.h
|
||||||
|
+++ b/lib/compiler.h
|
||||||
|
@@ -123,15 +123,6 @@ extern "C" {
|
||||||
|
#define assume(x)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-/* pure = function does not modify memory & return value is the same if
|
||||||
|
- * memory hasn't changed (=> allows compiler to optimize)
|
||||||
|
- *
|
||||||
|
- * Mostly autodetected by the compiler if function body is available (i.e.
|
||||||
|
- * static inline functions in headers). Since that implies it should only be
|
||||||
|
- * used in headers for non-inline functions, the "extern" is included here.
|
||||||
|
- */
|
||||||
|
-#define ext_pure extern __attribute__((pure))
|
||||||
|
-
|
||||||
|
/* for helper functions defined inside macros */
|
||||||
|
#define macro_inline static inline __attribute__((unused))
|
||||||
|
#define macro_pure static inline __attribute__((unused, pure))
|
||||||
|
diff --git a/lib/table.h b/lib/table.h
|
||||||
|
index 7e383dce808..5dec69ee7ea 100644
|
||||||
|
--- a/lib/table.h
|
||||||
|
+++ b/lib/table.h
|
||||||
|
@@ -197,29 +197,25 @@ static inline void route_table_set_info(struct route_table *table, void *d)
|
||||||
|
table->info = d;
|
||||||
|
}
|
||||||
|
|
||||||
|
-/* ext_pure => extern __attribute__((pure))
|
||||||
|
- * does not modify memory (but depends on mem), allows compiler to optimize
|
||||||
|
- */
|
||||||
|
-
|
||||||
|
extern void route_table_finish(struct route_table *table);
|
||||||
|
-ext_pure struct route_node *route_top(struct route_table *table);
|
||||||
|
-ext_pure struct route_node *route_next(struct route_node *node);
|
||||||
|
-ext_pure struct route_node *route_next_until(struct route_node *node,
|
||||||
|
- const struct route_node *limit);
|
||||||
|
+extern struct route_node *route_top(struct route_table *table);
|
||||||
|
+extern struct route_node *route_next(struct route_node *node);
|
||||||
|
+extern struct route_node *route_next_until(struct route_node *node,
|
||||||
|
+ const struct route_node *limit);
|
||||||
|
extern struct route_node *route_node_get(struct route_table *table,
|
||||||
|
union prefixconstptr pu);
|
||||||
|
-ext_pure struct route_node *route_node_lookup(struct route_table *table,
|
||||||
|
- union prefixconstptr pu);
|
||||||
|
-ext_pure struct route_node *route_node_lookup_maynull(struct route_table *table,
|
||||||
|
- union prefixconstptr pu);
|
||||||
|
-ext_pure struct route_node *route_node_match(struct route_table *table,
|
||||||
|
- union prefixconstptr pu);
|
||||||
|
-ext_pure struct route_node *route_node_match_ipv4(struct route_table *table,
|
||||||
|
- const struct in_addr *addr);
|
||||||
|
-ext_pure struct route_node *route_node_match_ipv6(struct route_table *table,
|
||||||
|
- const struct in6_addr *addr);
|
||||||
|
-
|
||||||
|
-ext_pure unsigned long route_table_count(struct route_table *table);
|
||||||
|
+extern struct route_node *route_node_lookup(struct route_table *table,
|
||||||
|
+ union prefixconstptr pu);
|
||||||
|
+extern struct route_node *route_node_lookup_maynull(struct route_table *table,
|
||||||
|
+ union prefixconstptr pu);
|
||||||
|
+extern struct route_node *route_node_match(struct route_table *table,
|
||||||
|
+ union prefixconstptr pu);
|
||||||
|
+extern struct route_node *route_node_match_ipv4(struct route_table *table,
|
||||||
|
+ const struct in_addr *addr);
|
||||||
|
+extern struct route_node *route_node_match_ipv6(struct route_table *table,
|
||||||
|
+ const struct in6_addr *addr);
|
||||||
|
+
|
||||||
|
+extern unsigned long route_table_count(struct route_table *table);
|
||||||
|
|
||||||
|
extern struct route_node *route_node_create(route_table_delegate_t *delegate,
|
||||||
|
struct route_table *table);
|
||||||
|
@@ -228,10 +224,10 @@ extern void route_node_destroy(route_table_delegate_t *delegate,
|
||||||
|
struct route_table *table,
|
||||||
|
struct route_node *node);
|
||||||
|
|
||||||
|
-ext_pure struct route_node *route_table_get_next(struct route_table *table,
|
||||||
|
- union prefixconstptr pu);
|
||||||
|
-ext_pure int route_table_prefix_iter_cmp(const struct prefix *p1,
|
||||||
|
- const struct prefix *p2);
|
||||||
|
+extern struct route_node *route_table_get_next(struct route_table *table,
|
||||||
|
+ union prefixconstptr pu);
|
||||||
|
+extern int route_table_prefix_iter_cmp(const struct prefix *p1,
|
||||||
|
+ const struct prefix *p2);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Iterator functions.
|
||||||
60
frr.spec
60
frr.spec
|
|
@ -1,34 +1,56 @@
|
||||||
%global frrversion 7.5.1
|
%global frrversion 7.5.1
|
||||||
%global frr_libdir /usr/libexec/frr
|
%global frr_libdir %{_libexecdir}/frr
|
||||||
|
|
||||||
%global _hardened_build 1
|
%global _hardened_build 1
|
||||||
%define _legacy_common_support 1
|
%define _legacy_common_support 1
|
||||||
|
|
||||||
Name: frr
|
Name: frr
|
||||||
Version: 7.5.1
|
Version: 7.5.1
|
||||||
Release: 5%{?checkout}%{?dist}
|
Release: 6%{?checkout}%{?dist}
|
||||||
Summary: Routing daemon
|
Summary: Routing daemon
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://www.frrouting.org
|
URL: http://www.frrouting.org
|
||||||
Source0: https://github.com/FRRouting/frr/releases/download/%{name}-%{frrversion}/%{name}-%{frrversion}.tar.gz
|
Source0: https://github.com/FRRouting/frr/releases/download/%{name}-%{frrversion}/%{name}-%{frrversion}.tar.gz
|
||||||
Source1: %{name}-tmpfiles.conf
|
Source1: %{name}-tmpfiles.conf
|
||||||
BuildRequires: perl-generators
|
BuildRequires: autoconf
|
||||||
BuildRequires: gcc gcc-c++
|
BuildRequires: automake
|
||||||
BuildRequires: net-snmp-devel
|
BuildRequires: bison >= 2.7
|
||||||
BuildRequires: texinfo libcap-devel autoconf automake libtool patch groff
|
BuildRequires: c-ares-devel
|
||||||
BuildRequires: readline readline-devel ncurses ncurses-devel
|
BuildRequires: flex
|
||||||
BuildRequires: git pam-devel c-ares-devel
|
BuildRequires: gcc
|
||||||
BuildRequires: json-c-devel bison >= 2.7 flex perl-XML-LibXML
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: python3-devel python3-sphinx python3-pytest
|
BuildRequires: git-core
|
||||||
BuildRequires: systemd systemd-devel
|
BuildRequires: groff
|
||||||
|
BuildRequires: json-c-devel
|
||||||
|
BuildRequires: libcap-devel
|
||||||
|
BuildRequires: libtool
|
||||||
BuildRequires: libyang-devel >= 0.16.74
|
BuildRequires: libyang-devel >= 0.16.74
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
Requires: net-snmp ncurses
|
BuildRequires: ncurses
|
||||||
Requires(post): systemd /sbin/install-info hostname
|
BuildRequires: ncurses-devel
|
||||||
Requires(preun): systemd /sbin/install-info
|
BuildRequires: net-snmp-devel
|
||||||
|
BuildRequires: pam-devel
|
||||||
|
BuildRequires: patch
|
||||||
|
BuildRequires: perl-XML-LibXML
|
||||||
|
BuildRequires: perl-generators
|
||||||
|
BuildRequires: python3-devel
|
||||||
|
BuildRequires: python3-pytest
|
||||||
|
BuildRequires: python3-sphinx
|
||||||
|
BuildRequires: readline-devel
|
||||||
|
BuildRequires: systemd-devel
|
||||||
|
BuildRequires: systemd-rpm-macros
|
||||||
|
BuildRequires: texinfo
|
||||||
|
|
||||||
|
Requires: net-snmp
|
||||||
|
Requires: ncurses
|
||||||
|
Requires(post): systemd
|
||||||
|
Requires(post): /sbin/install-info
|
||||||
|
Requires(post): hostname
|
||||||
|
Requires(preun): systemd
|
||||||
|
Requires(preun): /sbin/install-info
|
||||||
Requires(postun): systemd
|
Requires(postun): systemd
|
||||||
Provides: routingdaemon = %{version}-%{release}
|
|
||||||
Conflicts: quagga
|
Conflicts: quagga
|
||||||
|
Provides: routingdaemon = %{version}-%{release}
|
||||||
|
|
||||||
Patch0000: 0000-remove-babeld-and-ldpd.patch
|
Patch0000: 0000-remove-babeld-and-ldpd.patch
|
||||||
Patch0001: 0001-use-python3.patch
|
Patch0001: 0001-use-python3.patch
|
||||||
|
|
@ -37,6 +59,7 @@ Patch0003: 0003-disable-eigrp-crypto.patch
|
||||||
Patch0004: 0004-fips-mode.patch
|
Patch0004: 0004-fips-mode.patch
|
||||||
Patch0005: 0005-icc-options.patch
|
Patch0005: 0005-icc-options.patch
|
||||||
Patch0006: 0006-move-to-libexec.patch
|
Patch0006: 0006-move-to-libexec.patch
|
||||||
|
Patch0007: 0007-ospfd-crash.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
FRRouting is free software that manages TCP/IP based routing protocols. It takes
|
FRRouting is free software that manages TCP/IP based routing protocols. It takes
|
||||||
|
|
@ -107,8 +130,8 @@ install -p -m 644 %{_builddir}/%{name}-%{frrversion}/redhat/frr.logrotate %{buil
|
||||||
install -p -m 644 %{_builddir}/%{name}-%{frrversion}/redhat/frr.pam %{buildroot}/etc/pam.d/frr
|
install -p -m 644 %{_builddir}/%{name}-%{frrversion}/redhat/frr.pam %{buildroot}/etc/pam.d/frr
|
||||||
install -d -m 775 %{buildroot}/run/frr
|
install -d -m 775 %{buildroot}/run/frr
|
||||||
|
|
||||||
rm %{buildroot}%{_libdir}/frr/*.la
|
# Delete libtool archives
|
||||||
rm %{buildroot}%{_libdir}/frr/modules/*.la
|
find %{buildroot} -type f -name "*.la" -delete -print
|
||||||
|
|
||||||
#Upstream does not maintain a stable API, these headers from -devel subpackage are no longer needed
|
#Upstream does not maintain a stable API, these headers from -devel subpackage are no longer needed
|
||||||
rm %{buildroot}%{_libdir}/frr/*.so
|
rm %{buildroot}%{_libdir}/frr/*.so
|
||||||
|
|
@ -196,6 +219,9 @@ make check PYTHON=%{__python3}
|
||||||
%{_tmpfilesdir}/%{name}.conf
|
%{_tmpfilesdir}/%{name}.conf
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jul 21 2021 Michal Ruprich <mruprich@redhat.com> - 7.5.1-6
|
||||||
|
- Resolves: #1983967 - ospfd crashes in route_node_delete with assertion fail
|
||||||
|
|
||||||
* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 7.5.1-5
|
* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 7.5.1-5
|
||||||
- Rebuilt for RHEL 9 BETA for openssl 3.0
|
- Rebuilt for RHEL 9 BETA for openssl 3.0
|
||||||
Related: rhbz#1971065
|
Related: rhbz#1971065
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue