From nobody Tue Jan 23 21:00:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TKKGq1x7vz587dH; Tue, 23 Jan 2024 21:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TKKGq1PYQz4gQd; Tue, 23 Jan 2024 21:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706043603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3WaJPeEjjWyqL+BkvgrC+2jTAjAoP/PmFmGQpv/EFE0=; b=JF6i0p/CMDCjKJohSsaRFWy8L2uukCKDfiB/tzgQQ//ZLBIQUl6smAE06RlC1v1OEOAaHv sTs7QDhfMn0eXkJcX6fie0aMg0UHMXRjciODZZeiGlPBgD/POt473ywyQ6o/WrT+V4MOGk ollKbmpYc/nMdl84zEU8miVeQOwrfZlqvnvfjXpob+YswURbaNJiHh3D8vNNN80xDFgaAp 6TqsGHzqatCpMMZ28iaRK2luHg6smHAVD7dAAR+y3NXidA823GZBoHbbvJRGsfJKXtTOsR mY6koCC2EIbL+ooty0lU1fevTtCaEhD2Ga1Hr15Qu3kb5m7z8ljRGIvOTY1dkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706043603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3WaJPeEjjWyqL+BkvgrC+2jTAjAoP/PmFmGQpv/EFE0=; b=AdDeFrP1XWvDRwZYNvOewKShnq6sAiLNYtq4zwAVv+xl6pPu95ILtqcB7fizAWcQXup8ri AE+AnrNR/we7EsWQXITcnNPRLwwt5ocFWZoEdctjqsHK4tADrn9WcJumGMJLF4TfHc/xgb Yb55b5NiufjvjX1GTc9w4jwmejjT757YJePvVrf/mttiyQoFj7iCiCmQS/t4YfHU+Ui0pb 7o00bNUXff0d8Z0gwWSPuDjgnk0786jwXd/JyktHNnbT4Zfah6FT2gATmZxZ7q6ukuSV64 ppNlAknZWoBsb8ALP6vUcvGECZcNwOcTlcnfzkjfpgdqeAWWSf0eWFJ/gTtOMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706043603; a=rsa-sha256; cv=none; b=sm+O4sB/hV5VQCpDwqgfk5ngzvcm2uOrR/iRUS/bqecrcLxRef0bz0ZiEqw1C9OOeqVO3r UxIl5Jb2j2FVl0KOGbXARJKazjA8zPlOpqbWIL+Frnmj1hdCUDn/PDBGnubXmD0g4FGOeK /b7WVT8rEc9BtxZWEb9XaLY5u/G1u0GDzdskPJdUhuyW5XMA2lMCq2R+LUwM4LHqyajmhT jqoqv+QRYQY3ifiwPgbTR2E1WVxQNqBd3vLgH+ISl24H+tBQ/5YnJZikhxGyWbPXWhUUlo eOmcJqIzMyOeSlZ+zRlmZkKdA8gCil2i+U97VUoi6s6ZJyoX5+4raDVQaHWnaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TKKGq0SGnzmPq; Tue, 23 Jan 2024 21:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40NL03PJ003684; Tue, 23 Jan 2024 21:00:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NL03fr003677; Tue, 23 Jan 2024 21:00:03 GMT (envelope-from git) Date: Tue, 23 Jan 2024 21:00:03 GMT Message-Id: <202401232100.40NL03fr003677@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: e21c668719a6 - main - tcp: pass positive errno to tcp_drop() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e21c668719a65e119fe916f6bd22a05f33f6e315 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=e21c668719a65e119fe916f6bd22a05f33f6e315 commit e21c668719a65e119fe916f6bd22a05f33f6e315 Author: Gleb Smirnoff AuthorDate: 2024-01-23 20:52:55 +0000 Commit: Gleb Smirnoff CommitDate: 2024-01-23 20:59:21 +0000 tcp: pass positive errno to tcp_drop() Fixes: 446ccdd08e2a9f704f6348cd7f679e59183b99b3 --- sys/netinet/tcp_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index 125e28134c01..f0eb3bad33cf 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -299,7 +299,7 @@ tcp_output_locked(struct tcpcb *tp) KASSERT(tp->t_fb->tfb_flags & TCP_FUNC_OUTPUT_CANDROP, ("TCP stack %s requested tcp_drop(%p)", tp->t_fb->tfb_tcp_block_name, tp)); - tp = tcp_drop(tp, rv); + tp = tcp_drop(tp, -rv); } return (tp != NULL);