Date: Sat, 3 Jul 2021 21:12:04 GMT From: Lutz Donnerhacke <donner@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: f28455344483 - main - libalias: Fix API bug on initialization Message-ID: <202107032112.163LC4n4056426@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by donner: URL: https://cgit.FreeBSD.org/src/commit/?id=f28455344483310cfd1aa5c0bdd4d014810c0e32 commit f28455344483310cfd1aa5c0bdd4d014810c0e32 Author: Lutz Donnerhacke <donner@FreeBSD.org> AuthorDate: 2021-07-03 21:03:07 +0000 Commit: Lutz Donnerhacke <donner@FreeBSD.org> CommitDate: 2021-07-03 21:03:07 +0000 libalias: Fix API bug on initialization The kernel part of ipfw(8) does initialize LibAlias uncondistionally with an zeroized port range (allowed ports from 0 to 0). During restucturing of libalias, port ranges are used everytime and are therefor initialized with different values than zero. The secondary initialization from ipfw (and probably others) overrides the new default values and leave the instance in an unfunctional state. The obvious solution is to detect such reinitializations and use the new default value instead. MFC after: 3 days --- sys/netinet/libalias/alias_db.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/netinet/libalias/alias_db.c b/sys/netinet/libalias/alias_db.c index 9f8c6064d2a7..5b53067705bf 100644 --- a/sys/netinet/libalias/alias_db.c +++ b/sys/netinet/libalias/alias_db.c @@ -2048,9 +2048,15 @@ LibAliasSetAliasPortRange(struct libalias *la, u_short port_low, u_short port_high) { LIBALIAS_LOCK(la); - la->aliasPortLower = port_low; - /* Add 1 to the aliasPortLength as modulo has range of 1 to n-1 */ - la->aliasPortLength = port_high - port_low + 1; + if (port_low) { + la->aliasPortLower = port_low; + /* Add 1 to the aliasPortLength as modulo has range of 1 to n-1 */ + la->aliasPortLength = port_high - port_low + 1; + } else { + /* Set default values */ + la->aliasPortLower = 0x8000; + la->aliasPortLength = 0x8000; + } LIBALIAS_UNLOCK(la); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107032112.163LC4n4056426>