Date: Fri, 16 Oct 2020 11:27:01 +0000 (UTC) From: Marcin Wojtas <mw@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r366759 - head/sys/netipsec Message-ID: <202010161127.09GBR1HC074195@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mw Date: Fri Oct 16 11:27:01 2020 New Revision: 366759 URL: https://svnweb.freebsd.org/changeset/base/366759 Log: Trigger soft lifetime expiration on sequence number This patch adds 80% of UINT32_MAX limit on sequence number. When sequence number reaches limit kernel sends SADB_EXPIRE message to IKE daemon which is responsible to perform rekeying. Submitted by: Patryk Duda <pdk@semihalf.com> Reviewed by: ae Differential revision: https://reviews.freebsd.org/D22370 Obtained from: Semihalf Sponsored by: Stormshield Modified: head/sys/netipsec/key.c Modified: head/sys/netipsec/key.c ============================================================================== --- head/sys/netipsec/key.c Fri Oct 16 11:25:45 2020 (r366758) +++ head/sys/netipsec/key.c Fri Oct 16 11:27:01 2020 (r366759) @@ -101,6 +101,7 @@ #define FULLMASK 0xff #define _BITS(bytes) ((bytes) << 3) +#define UINT32_80PCT 0xcccccccc /* * Note on SA reference counting: * - SAs that are not in DEAD state will have (total external reference + 1) @@ -4536,7 +4537,11 @@ key_flush_sad(time_t now) (sav->lft_s->usetime != 0 && sav->firstused && now - sav->firstused > sav->lft_s->usetime) || (sav->lft_s->bytes != 0 && counter_u64_fetch( - sav->lft_c_bytes) > sav->lft_s->bytes))) { + sav->lft_c_bytes) > sav->lft_s->bytes) || + (!(sav->flags & SADB_X_SAFLAGS_ESN) && + (sav->replay != NULL) && ( + (sav->replay->count > UINT32_80PCT) || + (sav->replay->last > UINT32_80PCT))))) { SECASVAR_UNLOCK(sav); SAV_ADDREF(sav); LIST_INSERT_HEAD(&sexpireq, sav, drainq);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010161127.09GBR1HC074195>