From 0488e848d9ff76e640e0f8741c6ba124e71a7df8 Mon Sep 17 00:00:00 2001 From: Edward Tomasz Napierala Date: Fri, 5 Sep 2014 14:48:06 +0000 Subject: [PATCH] Turn two errors, which are possible to trigger only by bugs, into assertions. Discussed with: mav@ MFC after: 2 weeks Sponsored by: The FreeBSD Foundation --- usr.sbin/ctld/ctld.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c index c1593c2439b4..dde0330f6b5c 100644 --- a/usr.sbin/ctld/ctld.c +++ b/usr.sbin/ctld/ctld.c @@ -1760,9 +1760,7 @@ main_loop(struct conf *conf, bool dont_fork) client_salen = sizeof(client_sa); kernel_accept(&connection_id, &portal_id, (struct sockaddr *)&client_sa, &client_salen); - if (client_salen < client_sa.ss_len) - log_errx(1, "salen %u < %u", - client_salen, client_sa.ss_len); + assert(client_salen >= client_sa.ss_len); log_debugx("incoming connection, id %d, portal id %d", connection_id, portal_id); @@ -1806,10 +1804,8 @@ main_loop(struct conf *conf, bool dont_fork) &client_salen); if (client_fd < 0) log_err(1, "accept"); - if (client_salen < client_sa.ss_len) - log_errx(1, "salen %u < %u", - client_salen, - client_sa.ss_len); + assert(client_salen >= client_sa.ss_len); + handle_connection(portal, client_fd, (struct sockaddr *)&client_sa, dont_fork);