From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C62BC2BC61 for ; Tue, 30 Oct 2018 15:18:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 05C072080A for ; Tue, 30 Oct 2018 15:18:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 05C072080A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sysgo.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727521AbeJaAMQ (ORCPT ); Tue, 30 Oct 2018 20:12:16 -0400 Received: from mail.sysgo.com ([176.9.12.79]:47898 "EHLO mail.sysgo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726223AbeJaAMP (ORCPT ); Tue, 30 Oct 2018 20:12:15 -0400 From: David Engraf To: linux@dominikbrodowski.net, akpm@linux-foundation.org, gregkh@linuxfoundation.org, pombredanne@nexb.com, arnd@arndb.de, luc.vanoostenryck@gmail.com Cc: linux-kernel@vger.kernel.org, David Engraf Subject: [PATCH RESEND] initramfs: cleanup incomplete rootfs Date: Tue, 30 Oct 2018 16:18:05 +0100 Message-Id: <20181030151805.5519-1-david.engraf@sysgo.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181022134048.19693-1-david.engraf@sysgo.com> References: <20181022134048.19693-1-david.engraf@sysgo.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Unpacking an external initrd may fail e.g. not enough memory. This leads to an incomplete rootfs because some files might be extracted already. Fixed by cleaning the rootfs so the kernel is not using an incomplete rootfs. Signed-off-by: David Engraf --- init/initramfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/init/initramfs.c b/init/initramfs.c index 640557788026..aa3a46cfcb4e 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -548,7 +548,6 @@ static void __init free_initrd(void) initrd_end = 0; } -#ifdef CONFIG_BLK_DEV_RAM #define BUF_SIZE 1024 static void __init clean_rootfs(void) { @@ -595,7 +594,6 @@ static void __init clean_rootfs(void) ksys_close(fd); kfree(buf); } -#endif static int __init populate_rootfs(void) { @@ -638,8 +636,10 @@ static int __init populate_rootfs(void) printk(KERN_INFO "Unpacking initramfs...\n"); err = unpack_to_rootfs((char *)initrd_start, initrd_end - initrd_start); - if (err) + if (err) { printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err); + clean_rootfs(); + } free_initrd(); #endif } -- 2.17.1