From 9e01ff28664921ce9b6500681333e42fb133b4d0 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 2 Jul 2014 15:29:21 +1000 Subject: [PATCH] - deraadt@cvs.openbsd.org 2014/06/25 14:16:09 [sshbuf.c] unblock SIGSEGV before raising it ok djm --- ChangeLog | 4 ++++ sshbuf.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2af6fbd58..12b8f00f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,10 @@ [scp.c] when copying local->remote fails during read, don't send uninitialised heap to the remote end. Reported by Jann Horn + - deraadt@cvs.openbsd.org 2014/06/25 14:16:09 + [sshbuf.c] + unblock SIGSEGV before raising it + ok djm 20140618 - (tim) [openssh/session.c] Work around to get chroot sftp working on UnixWare diff --git a/sshbuf.c b/sshbuf.c index 7f7b9f1da..5df7c9f46 100644 --- a/sshbuf.c +++ b/sshbuf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshbuf.c,v 1.1 2014/04/30 05:29:56 djm Exp $ */ +/* $OpenBSD: sshbuf.c,v 1.2 2014/06/25 14:16:09 deraadt Exp $ */ /* * Copyright (c) 2011 Damien Miller * @@ -53,6 +53,7 @@ sshbuf_check_sanity(const struct sshbuf *buf) buf->off > buf->size)) { /* Do not try to recover from corrupted buffer internals */ SSHBUF_DBG(("SSH_ERR_INTERNAL_ERROR")); + signal(SIGSEGV, SIG_DFL); raise(SIGSEGV); return SSH_ERR_INTERNAL_ERROR; }