diff options
| author | Jacques Vidrine <nectar@FreeBSD.org> | 2003-09-16 16:45:16 +0000 |
|---|---|---|
| committer | Jacques Vidrine <nectar@FreeBSD.org> | 2003-09-16 16:45:16 +0000 |
| commit | 971a9eeda4bd581ebab810f7c5c7f7b78cd6a77e (patch) | |
| tree | b109b9f64310871212337c3aa573ce064b1609d2 | |
| parent | 0f9b4511e5a570a9645ed86dc61aead7bfe1dd3e (diff) | |
| download | src-test2-971a9eeda4bd581ebab810f7c5c7f7b78cd6a77e.tar.gz src-test2-971a9eeda4bd581ebab810f7c5c7f7b78cd6a77e.zip | |
Notes
| -rw-r--r-- | UPDATING | 3 | ||||
| -rw-r--r-- | crypto/openssh/buffer.c | 11 | ||||
| -rw-r--r-- | crypto/openssh/version.h | 2 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 |
4 files changed, 12 insertions, 6 deletions
@@ -17,6 +17,9 @@ minimal number of processes, if possible, for that patch. For those updates that don't have an advisory, or to be safe, you can do a full build and install as described in the COMMON ITEMS section. +20030916: p15 FreeBSD-SA-03:12.openssh + OpenSSH oversized packet buffer handling corrected. + 20030825: p14 FreeBSD-SA-03:11.sendmail Sendmail DNS map problem corrected. diff --git a/crypto/openssh/buffer.c b/crypto/openssh/buffer.c index ad04b267e0d8..9370998c97ce 100644 --- a/crypto/openssh/buffer.c +++ b/crypto/openssh/buffer.c @@ -69,6 +69,7 @@ buffer_append(Buffer *buffer, const void *data, u_int len) void * buffer_append_space(Buffer *buffer, u_int len) { + u_int newlen; void *p; if (len > 0x100000) @@ -98,11 +99,13 @@ restart: goto restart; } /* Increase the size of the buffer and retry. */ - buffer->alloc += len + 32768; - if (buffer->alloc > 0xa00000) + + newlen = buffer->alloc + len + 32768; + if (newlen > 0xa00000) fatal("buffer_append_space: alloc %u not supported", - buffer->alloc); - buffer->buf = xrealloc(buffer->buf, buffer->alloc); + newlen); + buffer->buf = xrealloc(buffer->buf, newlen); + buffer->alloc = newlen; goto restart; /* NOTREACHED */ } diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h index 138ebf22040b..fb662d25ec93 100644 --- a/crypto/openssh/version.h +++ b/crypto/openssh/version.h @@ -5,7 +5,7 @@ #define SSH_VERSION (ssh_version_get()) #define SSH_VERSION_BASE "OpenSSH_3.4p1" -#define SSH_VERSION_ADDENDUM "FreeBSD-20020702" +#define SSH_VERSION_ADDENDUM "FreeBSD-20030916" const char *ssh_version_get(void); void ssh_version_set_addendum(const char *add); diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index a7c64aefcc9a..cec247ab4dc3 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -36,7 +36,7 @@ TYPE="FreeBSD" REVISION="4.7" -BRANCH="RELEASE-p14" +BRANCH="RELEASE-p15" RELEASE="${REVISION}-${BRANCH}" VERSION="${TYPE} ${RELEASE}" |