public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Randy Robertson <rmrobert@vmware.com>
To: linux-kernel@vger.kernel.org
Cc: David Howells <dhowells@redhat.com>
Subject: [PATCH] initramfs: Fix initramfs to work with hardlinked init
Date: Mon, 6 Apr 2009 12:22:38 -0700	[thread overview]
Message-ID: <20090406192238.GA6621@vmware.com> (raw)

Change cb6ff208076b5f434db1b8c983429269d719cef5 seems to have broken
booting from initramfs with /sbin/init being a hardlink.  It seems like
the logic required for XIP on nommu, i.e. ftruncate to reported cpio
header file size (body_len) is broken for hardlinks, which have
a reported size of 0, and the truncate thus nukes the contents of the
file (in my case busybox), making boot impossible and ending with runaway
loop modprobe binfmt-0000 - and of course 0000 is not a valid binary format.

My fix is to only call ftruncate if size is non-zero which fixes things
for me, but I'm not certain whether this will break XIP for those files
on nommu systems, although I would guess not.

This update adds David's ack and fixes whitespace.

Signed-off-by: Randy Robertson <rmrobert@vmware.com>
Acked-by: David Howells <dhowells@redhat.com>
---
 init/initramfs.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/init/initramfs.c b/init/initramfs.c
index 80cd713..ddf30d1 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -310,7 +310,8 @@ static int __init do_name(void)
 			if (wfd >= 0) {
 				sys_fchown(wfd, uid, gid);
 				sys_fchmod(wfd, mode);
-				sys_ftruncate(wfd, body_len);
+				if (body_len)
+					sys_ftruncate(wfd, body_len);
 				vcollected = kstrdup(collected, GFP_KERNEL);
 				state = CopyFile;
 			}

             reply	other threads:[~2009-04-06 19:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-04-06 19:22 Randy Robertson [this message]
2009-04-07  0:02 ` [PATCH] initramfs: Fix initramfs to work with hardlinked init H. Peter Anvin
  -- strict thread matches above, loose matches on Subject: below --
2009-04-06  3:44 Randy Robertson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090406192238.GA6621@vmware.com \
    --to=rmrobert@vmware.com \
    --cc=dhowells@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox