diff options
| author | Kristof Provost <kp@FreeBSD.org> | 2024-11-09 09:53:37 +0000 |
|---|---|---|
| committer | Kristof Provost <kp@FreeBSD.org> | 2024-11-27 07:28:01 +0000 |
| commit | b4b2e420195affca5251ad40e268aeaff9fc5623 (patch) | |
| tree | b365b8e03b7dbc97013ba3ee2a908ccb2d430c2a | |
| parent | 87a1f9e8df1ed75ff055fe68d93736f922c53de4 (diff) | |
pf: fix potential state key leak
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)
| -rw-r--r-- | sys/netpfil/pf/pf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 810966f88a89..8dc7a153c3ce 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1302,7 +1302,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! */ |