A mirror of https://github.com/libressl/openbsd.git https://git.lua4.win/openbsd/atom?h=libressl-v2.1.3 2015-01-21T00:15:50+00:00 2015-01-21T00:15:50+00:00 doug 2015-01-21T00:15:50+00:00 urn:sha1:373f03d2553b34155832629b51845427daf04d02 There were four bugs fixed by this patch: * dtls1_buffer_record() now frees rdata->rbuf.buf on error. Since s->s3->rbuf was memset, rdata->rbuf is the only pointer left which points to the old rbuf. On error, rdata is freed so there will not be any way of freeing this memory unless we do it here. * Changed the return code of dtls1_buffer_record() to differentiate between queue full (0) and error (-1). See below as this differs from upstream. * Handle errors if calls to dtls1_buffer_record() fail with -1. Previously, it did not check the return value. * Changed the way receipts are recorded. Previously, it was recorded when processed successfully (whether buffered or not) in dtls1_process_record(). Now, it records when it is handled in dtls1_get_record(): either when it is entered into the queue to buffer for the next epoch or when it is processed directly. Processing buffered records does not add a receipt because it needed one in order to get into the queue. The above bugs combined contributed to an eventual DoS through memory exhaustion. The memory leak came from dtls1_buffer_record()'s error handling. The error handling can be triggered by a duplicate record or malloc failure. It was possible to add duplicate records because they were not being dropped. The faulty receipts logic did not detect replays when dealing with records for the next epoch. Additionally, dtls1_buffer_record()'s return value was not checked so an attacker could send repeated replay records for the next epoch. Reported to OpenSSL by Chris Mueller. Patch based on OpenSSL commit 103b171d8fc282ef435f8de9afbf7782e312961f and BoringSSL commit 44e2709cd65fbd2172b9516c79e56f1875f60300. Our patch matches BoringSSL's commit. OpenSSL returns 0 when the queue is full or when malloc() or pitem_new() fails. They return -1 on error including !ssl3_setup_buffers() which is another failure to allocate memory. BoringSSL and LibreSSL changed the return code for dtls1_buffer_record() to be 1 on success, 0 when the queue is full and -1 on error. input + ok bcook@, jsing@ 2015-01-20T04:41:01+00:00 krw 2015-01-20T04:41:01+00:00 urn:sha1:dc9caa98608febe68c6dc476ae558592e7cb9134 ok deraadt@ 2015-01-19T20:21:40+00:00 bcook 2015-01-19T20:21:40+00:00 urn:sha1:8da41a08c1b0ad547a78765a94025ba2a25b5fb0 The latest NetBSD (6.1.5) arc4random does not appear to reseed the CRNG state after a fork, so provide an override until the fork-safe version in CVS appears in a release. These are the same as the FreeBSD shims. ok deraadt@ 2015-01-17T18:01:43+00:00 tedu 2015-01-17T18:01:43+00:00 urn:sha1:4caf5c8d92e5d9ee7a921d30e76257e53f2fc21e 1. it's not a bug; it's a caveat. 2. "slightly unsafe" gives me the willies. 3. one .Xr to malloc should suffice ok deraadt jmc 2015-01-16T18:20:14+00:00 millert 2015-01-16T18:20:14+00:00 urn:sha1:b9a57300a47af99b65aec8941487e8a7800ca3b0 otherwise we end up needlessly replacing a NUL with a NUL. OK deraadt@ 2015-01-16T18:18:58+00:00 millert 2015-01-16T18:18:58+00:00 urn:sha1:75ff78098670f8d56c60d3f06e0ab5378c725e8f 2015-01-16T18:10:31+00:00 millert 2015-01-16T18:10:31+00:00 urn:sha1:9f09f1b46eea11049dd18b47ce2eac1ebb92f16e OK deraadt@ 2015-01-16T16:48:51+00:00 deraadt 2015-01-16T16:48:51+00:00 urn:sha1:7027596ae70e4cf09e00ec2f7cb7434e59c533db review by millert, binary checking process with doug, concept with guenther 2015-01-16T14:34:51+00:00 reyk 2015-01-16T14:34:51+00:00 urn:sha1:faa149ebaec577e1fb906bab49bcab3e8f495206 using the name of relayd relay or smtpd pki, use a 32 byte arc4random buffer that should be unique for the context. This fixes an issue in OpenSMTPD when a long pki name could break the configuration. OK gilles@ benno@ 2015-01-16T01:58:18+00:00 schwarze 2015-01-16T01:58:18+00:00 urn:sha1:2f61f7a2aa004c93e4fd074ef11e9345d25f7283 since yesterday, "mandoc -Tlint -Wfatal" can no longer fail. Instead, as suggested by deraadt@, provide a manlint target that is *not* run during make build, but can be run whenever you want to check syntax of manuals. "nice stuff" deraadt@