[openssh-commits] [openssh] 01/06: upstream: use sshpkt_fatal instead of plain fatal() for errors in

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 1b23e24d21238f49d362b4304625dace6afbd4eb
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Thu Jul 23 06:33:06 2026 +0000

    upstream: use sshpkt_fatal instead of plain fatal() for errors in
    
    the packet code as this provides context of the failing peer (address, port,
    user, etc). Based on patch from Dag-Erling Smørgrav
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    OpenBSD-Commit-ID: 2e50ab08ab697722230f5d7dbebc9ea3c4f2931b
---
 packet.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packet.c b/packet.c
index cb4284795..7c8589728 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.340 2026/07/21 06:17:42 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.341 2026/07/23 06:33:06 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -1578,7 +1578,7 @@ ssh_packet_read(struct ssh *ssh)
 	int r;
 
 	if ((r = ssh_packet_read_seqnr(ssh, &type, NULL)) != 0)
-		fatal_fr(r, "read");
+		sshpkt_fatal(ssh, r, "read");
 	return type;
 }
 
@@ -2047,7 +2047,7 @@ ssh_packet_send_debug(struct ssh *ssh, const char *fmt,...)
 	    (r = sshpkt_put_cstring(ssh, "")) != 0 ||
 	    (r = sshpkt_send(ssh)) != 0 ||
 	    (r = ssh_packet_write_wait(ssh)) != 0)
-		fatal_fr(r, "send DEBUG");
+		sshpkt_fatal(ssh, r, "send DEBUG");
 }
 
 void

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.