upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pf: fix potential state key leak

Browse source 
If we fail to attach the new state keys in pf_state_key_attach() we are
expected to free both keys. Do so.
Note that in some scenarios both key are the same, so check for that
before freeing.

MFC after:	2 weeks
Sponsored by:	Rubicon Communications, LLC ("Netgate")
Differential Revision:	https://reviews.freebsd.org/D47495

(cherry picked from commit 371bd29d4b22257a7e92e1e711cca3d94cfbd00d)
This commit is contained in:
Kristof Provost 2024-11-09 10:53:37 +01:00 committed by Franco Fichtner
parent 14115a62ca
commit ec74127326
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/netpfil/pf/pf.c
View file

@ -1359,7 +1359,9 @@ keyattach:
s->timeout = PFTM_UNLINKED;
PF_HASHROW_UNLOCK(ih);
KEYS_UNLOCK();
uma_zfree(V_pf_state_key_z, sk);
uma_zfree(V_pf_state_key_z, skw);
if (skw != sks)
uma_zfree(V_pf_state_key_z, sks);
if (idx == PF_SK_STACK)
pf_detach_state(s);
return (EEXIST); /* collision! */