Date: Fri, 17 Sep 2021 19:12:30 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 7fabaac2211e - main - rpc: Convert an SOLISTENING check to an assertion Message-ID: <202109171912.18HJCU54068168@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7fabaac2211e7ed1cec9650e46f4e03428411dcf commit 7fabaac2211e7ed1cec9650e46f4e03428411dcf Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2021-09-17 16:13:02 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2021-09-17 18:19:05 +0000 rpc: Convert an SOLISTENING check to an assertion Per the comment, this socket should always be a listening socket. MFC after: 1 week Sponsored by: The FreeBSD Foundation --- sys/rpc/svc_vc.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/rpc/svc_vc.c b/sys/rpc/svc_vc.c index d81c0b01d84d..77452d906594 100644 --- a/sys/rpc/svc_vc.c +++ b/sys/rpc/svc_vc.c @@ -328,11 +328,9 @@ svc_vc_accept(struct socket *head, struct socket **sop) int error = 0; short nbio; - /* XXXGL: shouldn't that be an assertion? */ - if (!SOLISTENING(head)) { - error = EINVAL; - goto done; - } + KASSERT(SOLISTENING(head), + ("%s: socket %p is not listening", __func__, head)); + #ifdef MAC error = mac_socket_check_accept(curthread->td_ucred, head); if (error != 0)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109171912.18HJCU54068168>