From 49f3ea024bc1a12c82d3729254221d5a0242794d Mon Sep 17 00:00:00 2001 From: Mark Johnston Date: Thu, 25 Mar 2021 17:55:20 -0400 Subject: [PATCH] accept_filter: Fix filter parameter handling For filters which implement accf_create, the setsockopt(2) handler caches the filter name in the socket, but it also incorrectly frees the buffer containing the copy, leaving a dangling pointer. Note that no accept filters provided in the base system are susceptible to this, as they don't implement accf_create. Reported by: Alexey Kulaev Discussed with: emaste Sponsored by: The FreeBSD Foundation Approved by: so Security: CVE-2021-29627 Security: FreeBSD-SA-21:09.accept_filter (cherry picked from commit 653a437c04440495cd8e7712c7cf39444f26f1ee) (cherry picked from commit 6008a5fad3c110c4ec03cc3fe60ce41c4e548b98) --- sys/kern/uipc_accf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/kern/uipc_accf.c b/sys/kern/uipc_accf.c index 9aab541883d..98cefe0789a 100644 --- a/sys/kern/uipc_accf.c +++ b/sys/kern/uipc_accf.c @@ -298,6 +298,7 @@ accept_filt_setopt(struct socket *so, struct sockopt *sopt) so->sol_accept_filter = afp; so->sol_accept_filter_arg = accept_filter_arg; so->sol_accept_filter_str = accept_filter_str; + accept_filter_str = NULL; so->so_options |= SO_ACCEPTFILTER; out: SOCK_UNLOCK(so); -- 2.45.0