Annotation of /trunk/busybox/patches/busybox-1.24.1-truncate-open-mode.patch
Parent Directory | Revision Log
Revision 2755 -
(hide annotations)
(download)
Fri Jan 15 14:29:01 2016 UTC (8 years, 8 months ago) by niro
File size: 3950 byte(s)
Fri Jan 15 14:29:01 2016 UTC (8 years, 8 months ago) by niro
File size: 3950 byte(s)
-busybox-1.24.1 patches
1 | niro | 2755 | From be729c1d3b5c923f10871dd68ea94156d0f8c803 Mon Sep 17 00:00:00 2001 |
2 | From: Ari Sundholm <ari@tuxera.com> | ||
3 | Date: Mon, 4 Jan 2016 15:40:37 +0200 | ||
4 | Subject: [PATCH] truncate: always set mode when opening file to avoid fortify | ||
5 | errors | ||
6 | |||
7 | Busybox crashes due to no mode being given when opening: | ||
8 | $ ./busybox truncate -s 1M foo | ||
9 | *** invalid open64 call: O_CREAT without mode ***: ./busybox terminated | ||
10 | ======= Backtrace: ========= | ||
11 | /lib/x86_64-linux-gnu/libc.so.6(+0x7338f)[0x7f66d921338f] | ||
12 | /lib/x86_64-linux-gnu/libc.so.6(__fortify_fail+0x5c)[0x7f66d92aac9c] | ||
13 | /lib/x86_64-linux-gnu/libc.so.6(+0xeb6aa)[0x7f66d928b6aa] | ||
14 | ./busybox[0x4899f9] | ||
15 | ======= Memory map: ======== | ||
16 | 00400000-004d0000 r-xp 00000000 00:1a 137559 /home/ari/busybox/busybox | ||
17 | 006cf000-006d0000 r--p 000cf000 00:1a 137559 /home/ari/busybox/busybox | ||
18 | 006d0000-006d1000 rw-p 000d0000 00:1a 137559 /home/ari/busybox/busybox | ||
19 | 006d1000-006d4000 rw-p 00000000 00:00 0 | ||
20 | 014e7000-01508000 rw-p 00000000 00:00 0 [heap] | ||
21 | 7f66d8f8a000-7f66d8fa0000 r-xp 00000000 08:07 1579008 /lib/x86_64-linux-gnu/libgcc_s.so.1 | ||
22 | 7f66d8fa0000-7f66d919f000 ---p 00016000 08:07 1579008 /lib/x86_64-linux-gnu/libgcc_s.so.1 | ||
23 | 7f66d919f000-7f66d91a0000 rw-p 00015000 08:07 1579008 /lib/x86_64-linux-gnu/libgcc_s.so.1 | ||
24 | 7f66d91a0000-7f66d935b000 r-xp 00000000 08:07 1578994 /lib/x86_64-linux-gnu/libc-2.19.so | ||
25 | 7f66d935b000-7f66d955a000 ---p 001bb000 08:07 1578994 /lib/x86_64-linux-gnu/libc-2.19.so | ||
26 | 7f66d955a000-7f66d955e000 r--p 001ba000 08:07 1578994 /lib/x86_64-linux-gnu/libc-2.19.so | ||
27 | 7f66d955e000-7f66d9560000 rw-p 001be000 08:07 1578994 /lib/x86_64-linux-gnu/libc-2.19.so | ||
28 | 7f66d9560000-7f66d9565000 rw-p 00000000 00:00 0 | ||
29 | 7f66d9565000-7f66d966a000 r-xp 00000000 08:07 1579020 /lib/x86_64-linux-gnu/libm-2.19.so | ||
30 | 7f66d966a000-7f66d9869000 ---p 00105000 08:07 1579020 /lib/x86_64-linux-gnu/libm-2.19.so | ||
31 | 7f66d9869000-7f66d986a000 r--p 00104000 08:07 1579020 /lib/x86_64-linux-gnu/libm-2.19.so | ||
32 | 7f66d986a000-7f66d986b000 rw-p 00105000 08:07 1579020 /lib/x86_64-linux-gnu/libm-2.19.so | ||
33 | 7f66d986b000-7f66d988e000 r-xp 00000000 08:07 1578981 /lib/x86_64-linux-gnu/ld-2.19.so | ||
34 | 7f66d9a64000-7f66d9a67000 rw-p 00000000 00:00 0 | ||
35 | 7f66d9a8a000-7f66d9a8d000 rw-p 00000000 00:00 0 | ||
36 | 7f66d9a8d000-7f66d9a8e000 r--p 00022000 08:07 1578981 /lib/x86_64-linux-gnu/ld-2.19.so | ||
37 | 7f66d9a8e000-7f66d9a8f000 rw-p 00023000 08:07 1578981 /lib/x86_64-linux-gnu/ld-2.19.so | ||
38 | 7f66d9a8f000-7f66d9a90000 rw-p 00000000 00:00 0 | ||
39 | 7ffc47761000-7ffc47782000 rw-p 00000000 00:00 0 [stack] | ||
40 | 7ffc477ab000-7ffc477ad000 r-xp 00000000 00:00 0 [vdso] | ||
41 | ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0 [vsyscall] | ||
42 | Aborted (core dumped) | ||
43 | $ | ||
44 | |||
45 | Fix this by simply always setting the mode, as it doesn't hurt even | ||
46 | when O_CREAT is not specified. | ||
47 | |||
48 | This bug is a regression introduced in fc3e40e, as xopen(), which | ||
49 | was originally used, would automatically set the mode. | ||
50 | |||
51 | Signed-off-by: Ari Sundholm <ari@tuxera.com> | ||
52 | Signed-off-by: Mike Frysinger <vapier@gentoo.org> | ||
53 | (cherry picked from commit e111a1640494fe87fc913f94fae3bb805de0fc99) | ||
54 | --- | ||
55 | coreutils/truncate.c | 2 +- | ||
56 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
57 | |||
58 | diff --git a/coreutils/truncate.c b/coreutils/truncate.c | ||
59 | index e5fa656..4c997bf 100644 | ||
60 | --- a/coreutils/truncate.c | ||
61 | +++ b/coreutils/truncate.c | ||
62 | @@ -64,7 +64,7 @@ int truncate_main(int argc UNUSED_PARAM, char **argv) | ||
63 | |||
64 | argv += optind; | ||
65 | while (*argv) { | ||
66 | - int fd = open(*argv, flags); | ||
67 | + int fd = open(*argv, flags, 0666); | ||
68 | if (fd < 0) { | ||
69 | if (errno != ENOENT || !(opts & OPT_NOCREATE)) { | ||
70 | bb_perror_msg("%s: open", *argv); | ||
71 | -- | ||
72 | 2.6.2 | ||
73 |