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:28:54 +0000
commit3a84efbedca5c8c45e40bdcaa4e1ae0e15fff94d (patch)
tree73ebf6c3324c45fd490dc2f35e9411ba4bb0ca45
parentc66c9ae5dc4b11de990fd50627f62398ec88e8d1 (diff)
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 ab05da880e46..dd028c660d2b 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -467,7 +467,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)
@@ -484,6 +483,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);
}