Bug 190735
| Summary: | truncate(1) integer overflow issues with size command line arg -- diff with unit tests attached | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | Base System | Reporter: | Kirk Russell <bugmeister> | ||||||
| Component: | bin | Assignee: | Jilles Tjoelker <jilles> | ||||||
| Status: | Closed FIXED | ||||||||
| Severity: | Affects Some People | CC: | bugmeister, jilles | ||||||
| Priority: | --- | Flags: | jilles:
mfc-stable10+
jilles: mfc-stable9+ jilles: mfc-stable8- |
||||||
| Version: | 10.0-RELEASE | ||||||||
| Hardware: | Any | ||||||||
| OS: | Any | ||||||||
| Attachments: |
|
||||||||
|
Description
Kirk Russell
2014-06-06 23:56:49 UTC
This looks useful. Is it possible to do without the new undocumented -D option? Perhaps you could ktrace for truncate(2) calls or add numbers to error messages. (A truncate() to something close to OFF_MAX should certainly not be expected to work, so checking for sizes of files may not be sufficient.) Instead of the PRIdMAX macro from <inttypes.h>, please use "jd". Jilles, thanks for looking! I have removed the new undocumented -D option and stopped using the macro from <inttypes.h>. I like your idea of using ktrace but I will want to research that idea before including that in a diff -- I will remove this ktrace/-D stuff from the patch -- I hope that is okay. I will attach a new patch to this bug, with the new changes. You can clarify your comment the expectations of off_t being OFF_MAX? My idea is the truncate utility needs to indicate an error if OFF_MAX < size < OFF_MIN. The function humanize_number() will allow numbers out-of-range for off_t and we should tell the user as soon as possible about this conversion problem. What the OS does with an large off_t passed to truncate() is the OS's business. For example, it is possible to create a huge sparse file in ZFS. I am not sure what this sparse file is useful for, but it is nice to see that ls -h works. # printf "%d\n" 0x7fffffffffffffff 9223372036854775807 # /usr/obj/usr/src/usr.bin/truncate/truncate -s 9223372036854775807 sparse.txt # ls -l sparse.txt -rw-r--r-- 1 root wheel 9223372036854775807 Jun 7 18:30 sparse.txt # ls -lh sparse.txt -rw-r--r-- 1 root wheel 8.0E Jun 7 18:33 sparse.txt Created attachment 143501 [details]
A second patch with the recommend changes.
A commit references this bug: Author: jilles Date: Mon Jun 9 10:39:56 UTC 2014 New revision: 267265 URL: http://svnweb.freebsd.org/changeset/base/267265 Log: truncate: Detect integer overflow, fix relative sizes, add tests. The change to expand_number (r204654) broke detection of too large sizes and relative sizes ('+'/'-'). Also add some tests. PR: 190735 Submitted by: Kirk Russell MFC after: 1 week Changes: head/etc/mtree/BSD.tests.dist head/usr.bin/truncate/Makefile head/usr.bin/truncate/tests/ head/usr.bin/truncate/tests/Makefile head/usr.bin/truncate/tests/truncate_test.sh head/usr.bin/truncate/truncate.c Applied to 11-current, with some changes (fixing buildworld/installworld WITH_TESTS=YES, removing duplicate test, fixing some test descriptions). Update bug to new MFC flags. A commit references this bug: Author: jilles Date: Sun Dec 7 22:30:55 UTC 2014 New revision: 275585 URL: https://svnweb.freebsd.org/changeset/base/275585 Log: MFC r267265: truncate: Detect integer overflow, fix relative sizes, add tests. The change to expand_number (r204654) broke detection of too large sizes and relative sizes ('+'/'-'). Also add some tests. The usr.bin/truncate/Makefile is slightly different in the MFC because src.opts.mk does not exist in stable/10. PR: 190735 Submitted by: Kirk Russell Changes: _U stable/10/ stable/10/etc/mtree/BSD.tests.dist stable/10/usr.bin/truncate/Makefile stable/10/usr.bin/truncate/tests/ stable/10/usr.bin/truncate/truncate.c A commit references this bug: Author: jilles Date: Sun Dec 21 23:22:14 UTC 2014 New revision: 276041 URL: https://svnweb.freebsd.org/changeset/base/276041 Log: MFC r267265: truncate: Detect integer overflow, fix relative sizes. The change to expand_number (r204654) broke detection of too large sizes and relative sizes ('+'/'-'). There are no tests in the MFC because stable/9 lacks the test framework. PR: 190735 Submitted by: Kirk Russell Changes: _U stable/9/usr.bin/truncate/ stable/9/usr.bin/truncate/truncate.c |
