Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6eb0be6 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] uml: hostfs: make hostfs= option work as a jail, as intended. 



When a given host directory is specified to be mounted both in hostfs=path1
and with mount option -o path2, we should give access to path1/path2, but this
does not happen.  Fix that in the simpler way.

Also, root_ino can be the empty string, since we use %s/%s as format.

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bca27113

fs/hostfs/hostfs_kern.c

+7 −5
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ struct dentry_operations hostfs_dentry_ops = { 
};



/* Changed in hostfs_args before the kernel starts running */

static char *root_ino = "/";

static char *root_ino = "";

static int append = 0;



#define HOSTFS_SUPER_MAGIC 0x00c0ffee
@@ -947,15 +947,17 @@ static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent) 
	sb->s_magic = HOSTFS_SUPER_MAGIC;

	sb->s_op = &hostfs_sbops;



	if((data == NULL) || (*data == '\0'))

		data = root_ino;

	/* NULL is printed as <NULL> by sprintf: avoid that. */

	if (data == NULL)

		data = "";



	err = -ENOMEM;

	name = kmalloc(strlen(data) + 1, GFP_KERNEL);

	name = kmalloc(strlen(root_ino) + 1

			+ strlen(data) + 1, GFP_KERNEL);

	if(name == NULL)

		goto out;



	strcpy(name, data);

	sprintf(name, "%s/%s", root_ino, data);



	root_inode = iget(sb, 0);

	if(root_inode == NULL)