On 10/09/18(Mon) 12:15, Mark Patruck wrote:
> I've tested with a current snapshot and two freshly installed systems
> and get the same error, but...
>
> reverting mpi@s 'Add per-TDB counters and a new SADB extension (1)'
> changes make the issues disappear.
>
> (1) https://marc.info/?l=openbsd-cvs&m=153546931106420&w=2
Does the smaller revert below also fix the issue?
Index: net/pfkeyv2.c
===================================================================
RCS file: /cvs/src/sys/net/pfkeyv2.c,v
retrieving revision 1.191
diff -u -p -r1.191 pfkeyv2.c
--- net/pfkeyv2.c 31 Aug 2018 12:55:46 -0000 1.191
+++ net/pfkeyv2.c 10 Sep 2018 13:39:01 -0000
@@ -793,8 +793,7 @@ pfkeyv2_get(struct tdb *tdb, void **head
void *p;
/* Find how much space we need */
- i = sizeof(struct sadb_sa) + sizeof(struct sadb_lifetime) +
- sizeof(struct sadb_x_counter);
+ i = sizeof(struct sadb_sa) + sizeof(struct sadb_lifetime);
if (tdb->tdb_soft_allocations || tdb->tdb_soft_bytes ||
tdb->tdb_soft_timeout || tdb->tdb_soft_first_use)
@@ -955,9 +954,6 @@ pfkeyv2_get(struct tdb *tdb, void **head
export_tap(&p, tdb);
}
#endif
-
- headers[SADB_X_EXT_COUNTER] = p;
- export_counter(&p, tdb);
rval = 0;
