diff options
author | Damien Miller <djm@mindrot.org> | 2014-07-02 15:29:21 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-07-02 15:29:21 +1000 |
commit | 9e01ff28664921ce9b6500681333e42fb133b4d0 (patch) | |
tree | 21116087bd1e9baea33c2ceba33c732c1a043846 | |
parent | 1845fe6bda0729e52f4c645137f4fc3070b5438a (diff) | |
download | openssh-git-9e01ff28664921ce9b6500681333e42fb133b4d0.tar.gz |
- deraadt@cvs.openbsd.org 2014/06/25 14:16:09
[sshbuf.c]
unblock SIGSEGV before raising it
ok djm
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | sshbuf.c | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -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 @@ -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; } |