From f682646719b3d44d5f9d8fe1b7bac45f60cb92ef Mon Sep 17 00:00:00 2001 From: djm Date: Sun, 6 Jun 2021 03:17:02 +0000 Subject: [PATCH] degrade gracefully if a sftp-server offers the limits@openssh.com extension but fails when the client tries to invoke it. Reported by Hector Martin via bz3318 --- usr.bin/ssh/sftp-client.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/usr.bin/ssh/sftp-client.c b/usr.bin/ssh/sftp-client.c index 00edab22421..2d255c075f6 100644 --- a/usr.bin/ssh/sftp-client.c +++ b/usr.bin/ssh/sftp-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-client.c,v 1.142 2021/04/03 06:18:41 djm Exp $ */ +/* $OpenBSD: sftp-client.c,v 1.143 2021/06/06 03:17:02 djm Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller * @@ -563,8 +563,12 @@ do_limits(struct sftp_conn *conn, struct sftp_limits *limits) if (id != msg_id) fatal("ID mismatch (%u != %u)", msg_id, id); if (type != SSH2_FXP_EXTENDED_REPLY) { - fatal("Expected SSH2_FXP_EXTENDED_REPLY(%u) packet, got %u", + debug_f("expected SSH2_FXP_EXTENDED_REPLY(%u) packet, got %u", SSH2_FXP_EXTENDED_REPLY, type); + /* Disable the limits extension */ + conn->exts &= ~SFTP_EXT_LIMITS; + sshbuf_free(msg); + return 0; } memset(limits, 0, sizeof(*limits)); -- 2.20.1