The branch releng/13.0 has been updated by markj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=af6611e5adc69d791fc1441a1078ffb6c2ea12f0
commit af6611e5adc69d791fc1441a1078ffb6c2ea12f0
Author: Mark Johnston <ma...@freebsd.org>
AuthorDate: 2021-03-25 21:55:20 +0000
Commit: Mark Johnston <ma...@freebsd.org>
CommitDate: 2021-03-28 15:03:37 +0000
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.
Approved by: re (gjb)
Reported by: Alexey Kulaev <alex.q...@gmail.com>
Discussed with: emaste
Security: kernel use-after-free
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 653a437c04440495cd8e7712c7cf39444f26f1ee)
(cherry picked from commit c7d10e7ec872070a40bbddc3158b1997c1df09af)
---
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 debf4b2deeb1..3ca64dd21e25 100644
--- a/sys/kern/uipc_accf.c
+++ b/sys/kern/uipc_accf.c
@@ -299,6 +299,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);
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
