upstream commit

fix regression in 7.6: failure to parse a signature request
message shouldn't be fatal to the process, just the request. Reported by Ron
Frederick

OpenBSD-Commit-ID: e5d01b3819caa1a2ad51fc57d6ded43f48bbcc05

1 files changed, 6 insertions, 3 deletions

diff --git a/ssh-agent.c b/ssh-agent.c
index 0c6c36592..a25f60a42 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.224 2017/07/24 04:34:28 djm Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.225 2017/11/15 00:13:40 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -287,8 +287,11 @@ process_sign_request2(SocketEntry *e)
                 fatal("%s: sshbuf_new failed", __func__);
         if ((r = sshkey_froms(e->request, &key)) != 0 ||
             (r = sshbuf_get_string_direct(e->request, &data, &dlen)) != 0 ||
-            (r = sshbuf_get_u32(e->request, &flags)) != 0)
-                fatal("%s: buffer error: %s", __func__, ssh_err(r));
+            (r = sshbuf_get_u32(e->request, &flags)) != 0) {
+                error("%s: couldn't parse request: %s", __func__, ssh_err(r));
+                goto send;
+        }
+
         if (flags & SSH_AGENT_OLD_SIGNATURE)
                 compat = SSH_BUG_SIGBLOB;
         if ((id = lookup_identity(key)) == NULL) {