Re: 2.6.2-mm1, selinux, and initrd

[James Morris]

On Thu, 5 Feb 2004 Valdis.Kletnieks@xxxxxx wrote:

> Booting 2.6.2-mm1, I get:
> 
> RAMDISK: Compressed image found at block 0
> VFS: Mounted root (ext2 filesystem).
> Mounted devfs on /dev
> VFS: Cannot open root device 
> 
> and things come to a screeching halt.  Absolutely nothing in the linuxrc
> seems to happen - and since the real root is on an LVM, we come to a
> screeching halt.

Vladis, 

Can you please try the patch below against  the 2.6.2-mm1 kernel and let 
me know if you still see the problem.


- James
-- 
James Morris
<jmorris@xxxxxxxxxx>

diff -urN -X dontdiff linux-2.6.2-mm1.o/fs/super.c linux-2.6.2-mm1.w/fs/super.c
--- linux-2.6.2-mm1.o/fs/super.c	2004-02-05 09:24:12.000000000 -0500
+++ linux-2.6.2-mm1.w/fs/super.c	2004-02-06 22:32:43.309927664 -0500
@@ -709,7 +709,6 @@
 	struct super_block *sb = ERR_PTR(-ENOMEM);
 	struct vfsmount *mnt;
 	int error;
-	char *secdata = NULL;
 
 	if (!type)
 		return ERR_PTR(-ENODEV);
@@ -718,24 +717,10 @@
 	if (!mnt)
 		goto out;
 
-	if (data) {
-		secdata = alloc_secdata();
-		if (!secdata) {
-			sb = ERR_PTR(-ENOMEM);
-			goto out_mnt;
-		}
-
-		error = security_sb_copy_data(fstype, data, secdata);
-		if (error) {
-			sb = ERR_PTR(error);
-			goto out_free_secdata;
-		}
-	}
-
 	sb = type->get_sb(type, flags, name, data);
 	if (IS_ERR(sb))
-		goto out_free_secdata;
- 	error = security_sb_kern_mount(sb, secdata);
+		goto out_mnt;
+ 	error = security_sb_kern_mount(sb, NULL);
  	if (error)
  		goto out_sb;
 	mnt->mnt_sb = sb;
@@ -749,8 +734,6 @@
 	up_write(&sb->s_umount);
 	deactivate_super(sb);
 	sb = ERR_PTR(error);
-out_free_secdata:
-	free_secdata(secdata);
 out_mnt:
 	free_vfsmnt(mnt);
 out:

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/