nginx: fix CVE-2016-4450

This commit is contained in:
Michael Gehring 2016-06-04 22:03:41 +02:00
parent 8134829854
commit 83152c1339
2 changed files with 17 additions and 1 deletions

View File

@ -0,0 +1,16 @@
http://mailman.nginx.org/pipermail/nginx-announce/2016/000179.html
--- src/os/unix/ngx_files.c
+++ src/os/unix/ngx_files.c
@@ -183,6 +183,12 @@ ngx_write_chain_to_file(ngx_file_t *file
/* create the iovec and coalesce the neighbouring bufs */
while (cl && vec.nelts < IOV_MAX) {
+
+ if (ngx_buf_special(cl->buf)) {
+ cl = cl->next;
+ continue;
+ }
+
if (prev == cl->buf->pos) {
iov->iov_len += cl->buf->last - cl->buf->pos;

View File

@ -1,7 +1,7 @@
# Template file for 'nginx' # Template file for 'nginx'
pkgname=nginx pkgname=nginx
version=1.8.1 version=1.8.1
revision=4 revision=5
makedepends="pcre-devel libressl-devel $(vopt_if geoip geoip-devel)" makedepends="pcre-devel libressl-devel $(vopt_if geoip geoip-devel)"
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
# fake configure run on host # fake configure run on host