Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9687fd91 authored by David Engraf's avatar David Engraf Committed by Linus Torvalds
Browse files

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: default avatarDavid Engraf <david.engraf@sysgo.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d97b07c5

init/initramfs.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -369,7 +369,8 @@ static int __init do_name(void) 
static int __init do_copy(void)

static int __init do_copy(void)

{

{

	if (count >= body_len) {

	if (count >= body_len) {

		xwrite(wfd, victim, body_len);

		if (xwrite(wfd, victim, body_len) != body_len)

			error("write error");

		sys_close(wfd);

		sys_close(wfd);

		do_utime(vcollected, mtime);

		do_utime(vcollected, mtime);

		kfree(vcollected);

		kfree(vcollected);
@@ -377,7 +378,8 @@ static int __init do_copy(void) 
		state = SkipIt;

		state = SkipIt;

		return 0;

		return 0;

	} else {

	} else {

		xwrite(wfd, victim, count);

		if (xwrite(wfd, victim, count) != count)

			error("write error");

		body_len -= count;

		body_len -= count;

		eat(count);

		eat(count);

		return 1;

		return 1;