Module Name: src
Committed By: hannken
Date: Thu Nov 19 10:45:37 UTC 2020
Modified Files:
src/libexec/httpd: bozohttpd.c
Log Message:
Bozohttpd clobbers files greater than 4GB on 32bit archs.
Make sure the alignment mask derived from pagesize is an off_t.
To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 src/libexec/httpd/bozohttpd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.123 src/libexec/httpd/bozohttpd.c:1.124
--- src/libexec/httpd/bozohttpd.c:1.123 Thu Oct 15 04:21:53 2020
+++ src/libexec/httpd/bozohttpd.c Thu Nov 19 10:45:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bozohttpd.c,v 1.123 2020/10/15 04:21:53 mrg Exp $ */
+/* $NetBSD: bozohttpd.c,v 1.124 2020/11/19 10:45:36 hannken Exp $ */
/* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */
@@ -907,7 +907,7 @@ mmap_and_write_part(bozohttpd_t *httpd,
*
* we use the write offset in all writes
*/
- mappedoffset = first_byte_pos & ~(httpd->page_size - 1);
+ mappedoffset = first_byte_pos & ~((off_t)httpd->page_size - 1);
mappedsz = (size_t)
(first_byte_pos - mappedoffset + sz + httpd->page_size - 1) &
~(httpd->page_size - 1);
