aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLv Yunlong <lylgood@foxmail.com>2021-05-18 19:23:15 +0000
committerMark Johnston <markj@FreeBSD.org>2021-05-25 13:26:00 +0000
commite53b671b4f75fe86ace1cb78566ccdbdb56aad01 (patch)
treebde3573b5c530eac4de3907a33bc231cfd804a34
parentb1304759ec5897f56626a8b81b3e4b8a78e47b89 (diff)
downloadsrc-e53b671b4f75fe86ace1cb78566ccdbdb56aad01.tar.gz
src-e53b671b4f75fe86ace1cb78566ccdbdb56aad01.zip
socket: Release cred reference later in sodealloc()
We dereference so->so_cred to update the per-uid socket buffer accounting, so the crfree() call must be deferred until after that point. PR: 255869 (cherry picked from commit b295c5ddcef4744ef7044d2327b4258b6ad055f0)
-rw-r--r--sys/kern/uipc_socket.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 7f06b51cf096..3436004b53a6 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -475,7 +475,6 @@ sodealloc(struct socket *so)
#endif
hhook_run_socket(so, NULL, HHOOK_SOCKET_CLOSE);
- crfree(so->so_cred);
khelp_destroy_osd(&so->osd);
if (SOLISTENING(so)) {
if (so->sol_accept_filter != NULL)
@@ -492,6 +491,7 @@ sodealloc(struct socket *so)
SOCKBUF_LOCK_DESTROY(&so->so_snd);
SOCKBUF_LOCK_DESTROY(&so->so_rcv);
}
+ crfree(so->so_cred);
mtx_destroy(&so->so_lock);
uma_zfree(socket_zone, so);
}