From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from svenfoo.org ([82.94.215.22] helo=mail.zonque.de) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TcxaZ-0001RJ-Me for kexec@lists.infradead.org; Mon, 26 Nov 2012 12:15:05 +0000 From: Daniel Mack Subject: [PATCH 2/2] fs2dt: check for initrd_size != 0 when adding initrd entries Date: Mon, 26 Nov 2012 13:14:43 +0100 Message-Id: <1353932083-8710-2-git-send-email-zonque@gmail.com> In-Reply-To: <1353932083-8710-1-git-send-email-zonque@gmail.com> References: <1353932083-8710-1-git-send-email-zonque@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: kexec-bounces@lists.infradead.org Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: kexec@lists.infradead.org Cc: horms@verge.net.au, s.neumann@raumfeld.com, Daniel Mack This prevents the creation of chosen/linux,initrd-{start,stop} entries with zero length. Signed-off-by: Daniel Mack --- kexec/fs2dt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kexec/fs2dt.c b/kexec/fs2dt.c index 79258a1..5d933c8 100644 --- a/kexec/fs2dt.c +++ b/kexec/fs2dt.c @@ -525,7 +525,7 @@ static void putnode(void) putprops(dn, namelist, numlist); /* Add initrd entries to the second kernel */ - if (initrd_base && !strcmp(basename,"chosen/")) { + if (initrd_base && initrd_size && !strcmp(basename,"chosen/")) { int len = 8; unsigned long long initrd_end; -- 1.7.11.7 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec