2004-11-11 16:33:56

by Juerg Billeter

Subject: [PATCH RESEND] Don't remove /sys in initramfs

Using the "resume" kernel parameter together with an initramfs revealed
a bug that causes removal of the /sys directory in the initramfs' tmpfs,
making the system unbootable.

The source of the problem is that the try_name() function removes
the /sys directory unconditionally, instead of removing it only when it
has been created by try_name().

The attached patch only removes /sys if it has been created before.

Please CC me, I'm not on lkml.

Juerg

--
Signed-off-by: Juerg Billeter <[email protected]>

diff -upNr linux-2.6.10-rc1-bk15.orig/init/do_mounts.c linux-2.6.10-rc1-bk15/init/do_mounts.c
--- linux-2.6.10-rc1-bk15.orig/init/do_mounts.c 2004-10-18 23:53:51.000000000 +0200
+++ linux-2.6.10-rc1-bk15/init/do_mounts.c 2004-11-05 16:24:17.816549948 +0100
@@ -142,7 +142,7 @@ dev_t __init name_to_dev_t(char *name)
int part;

#ifdef CONFIG_SYSFS
- sys_mkdir("/sys", 0700);
+ int mkdir_err = sys_mkdir("/sys", 0700);
if (sys_mount("sysfs", "/sys", "sysfs", 0, NULL) < 0)
goto out;
#endif
@@ -197,7 +197,8 @@ done:
#ifdef CONFIG_SYSFS
sys_umount("/sys", 0);
out:
- sys_rmdir("/sys");
+ if (!mkdir_err)
+ sys_rmdir("/sys");
#endif
return res;
fail:

2004-11-12 00:56:39

by Andrew Morton

Subject: Re: [PATCH RESEND] Don't remove /sys in initramfs

Juerg Billeter <[email protected]> wrote:
>
> Using the "resume" kernel parameter together with an initramfs revealed
> a bug that causes removal of the /sys directory in the initramfs' tmpfs,
> making the system unbootable.
>
> The source of the problem is that the try_name() function removes
> the /sys directory unconditionally, instead of removing it only when it
> has been created by try_name().
>
> The attached patch only removes /sys if it has been created before.

The patch looks sane. Your email client replaced tabs with spaces. I
fixed that up. In future, please send the patch to yourself first, check
that it still applies, then send it on, thanks.