diff options
| author | David Engraf <david.engraf@sysgo.com> | 2014-08-08 17:23:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-08 18:57:26 -0400 |
| commit | 9687fd9101afaa1c4b1de7ffd2f9d7e53f45b29f (patch) | |
| tree | 97b93d548e3f0c288a3191038f8181ec8bf07bf7 /init | |
| parent | d97b07c54f34e88352ebe676beb798c8f59ac588 (diff) | |
initramfs: add write error checks
On a system with low memory extracting the initramfs may fail. If this
happens the user gets "Failed to execute /init" instead of an initramfs
error.
Check return value of sys_write and call error() when the write was
incomplete or failed.
Signed-off-by: David Engraf <david.engraf@sysgo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/initramfs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/init/initramfs.c b/init/initramfs.c index a7566031242e..bece48c3461e 100644 --- a/init/initramfs.c +++ b/init/initramfs.c | |||
| @@ -369,7 +369,8 @@ static int __init do_name(void) | |||
| 369 | static int __init do_copy(void) | 369 | static int __init do_copy(void) |
| 370 | { | 370 | { |
| 371 | if (count >= body_len) { | 371 | if (count >= body_len) { |
| 372 | xwrite(wfd, victim, body_len); | 372 | if (xwrite(wfd, victim, body_len) != body_len) |
| 373 | error("write error"); | ||
| 373 | sys_close(wfd); | 374 | sys_close(wfd); |
| 374 | do_utime(vcollected, mtime); | 375 | do_utime(vcollected, mtime); |
| 375 | kfree(vcollected); | 376 | kfree(vcollected); |
| @@ -377,7 +378,8 @@ static int __init do_copy(void) | |||
| 377 | state = SkipIt; | 378 | state = SkipIt; |
| 378 | return 0; | 379 | return 0; |
| 379 | } else { | 380 | } else { |
| 380 | xwrite(wfd, victim, count); | 381 | if (xwrite(wfd, victim, count) != count) |
| 382 | error("write error"); | ||
| 381 | body_len -= count; | 383 | body_len -= count; |
| 382 | eat(count); | 384 | eat(count); |
| 383 | return 1; | 385 | return 1; |