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

Commit af175527 authored by Alistair Strachan's avatar Alistair Strachan Committed by Gerrit - the friendly Code Review server
Browse files

Revert "proc: Convert proc_mount to use mount_ns." 



This reverts commit e94591d0.

This cleanup broke the parsing of procfs mount parameters.

Bug: 79705088
Change-Id: I445c816cec4ea97b2f6f4abf516109f17b0f214a
Signed-off-by: default avatarAlistair Strachan <astrachan@google.com>
Git-commit: c396a018
Git-repo: https://android.googlesource.com/kernel/common/


Signed-off-by: default avatarSachin Grover <sgrover@codeaurora.org>
parent f8912b1f

fs/proc/inode.c

+2 −7
Original line number Original line Diff line number Diff line
@@ -456,17 +456,12 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de) 
	return inode;

	return inode;

}

}





int proc_fill_super(struct super_block *s, void *data, int silent)

int proc_fill_super(struct super_block *s)

{

{

	struct pid_namespace *ns = get_pid_ns(s->s_fs_info);

	struct inode *root_inode;

	struct inode *root_inode;

	int ret;

	int ret;





	if (!proc_parse_options(data, ns))

	s->s_iflags |= SB_I_USERNS_VISIBLE | SB_I_NODEV;

		return -EINVAL;



	/* User space would break if executables or devices appear on proc */

	s->s_iflags |= SB_I_USERNS_VISIBLE | SB_I_NOEXEC | SB_I_NODEV;

	s->s_flags |= MS_NODIRATIME | MS_NOSUID | MS_NOEXEC;

	s->s_flags |= MS_NODIRATIME | MS_NOSUID | MS_NOEXEC;

	s->s_blocksize = 1024;

	s->s_blocksize = 1024;

	s->s_blocksize_bits = 10;

	s->s_blocksize_bits = 10;

fs/proc/internal.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -213,7 +213,7 @@ extern const struct file_operations proc_reclaim_operations; 




extern void proc_init_inodecache(void);

extern void proc_init_inodecache(void);

extern struct inode *proc_get_inode(struct super_block *, struct proc_dir_entry *);

extern struct inode *proc_get_inode(struct super_block *, struct proc_dir_entry *);

extern int proc_fill_super(struct super_block *, void *data, int flags);

extern int proc_fill_super(struct super_block *);

extern void proc_entry_rundown(struct proc_dir_entry *);

extern void proc_entry_rundown(struct proc_dir_entry *);





/*

/*
@@ -278,7 +278,6 @@ static inline void proc_tty_init(void) {} 
 * root.c

 * root.c

 */

 */

extern struct proc_dir_entry proc_root;

extern struct proc_dir_entry proc_root;

extern int proc_parse_options(char *options, struct pid_namespace *pid);





extern void proc_self_init(void);

extern void proc_self_init(void);

extern int proc_remount(struct super_block *, int *, char *);

extern int proc_remount(struct super_block *, int *, char *);

fs/proc/root.c

+48 −4
Original line number Original line Diff line number Diff line
@@ -23,6 +23,21 @@ 




#include "internal.h"

#include "internal.h"





static int proc_test_super(struct super_block *sb, void *data)

{

	return sb->s_fs_info == data;

}



static int proc_set_super(struct super_block *sb, void *data)

{

	int err = set_anon_super(sb, NULL);

	if (!err) {

		struct pid_namespace *ns = (struct pid_namespace *)data;

		sb->s_fs_info = get_pid_ns(ns);

	}

	return err;

}



enum {

enum {

	Opt_gid, Opt_hidepid, Opt_err,

	Opt_gid, Opt_hidepid, Opt_err,

};

};
@@ -33,7 +48,7 @@ static const match_table_t tokens = { 
	{Opt_err, NULL},

	{Opt_err, NULL},

};

};





int proc_parse_options(char *options, struct pid_namespace *pid)

static int proc_parse_options(char *options, struct pid_namespace *pid)

{

{

	char *p;

	char *p;

	substring_t args[MAX_OPT_ARGS];

	substring_t args[MAX_OPT_ARGS];
@@ -85,16 +100,45 @@ int proc_remount(struct super_block *sb, int *flags, char *data) 
static struct dentry *proc_mount(struct file_system_type *fs_type,

static struct dentry *proc_mount(struct file_system_type *fs_type,

	int flags, const char *dev_name, void *data)

	int flags, const char *dev_name, void *data)

{

{

	int err;

	struct super_block *sb;

	struct pid_namespace *ns;

	struct pid_namespace *ns;

	char *options;





	if (flags & MS_KERNMOUNT) {

	if (flags & MS_KERNMOUNT) {

		ns = data;

		ns = (struct pid_namespace *)data;

		data = NULL;

		options = NULL;

	} else {

	} else {

		ns = task_active_pid_ns(current);

		ns = task_active_pid_ns(current);

		options = data;



		/* Does the mounter have privilege over the pid namespace? */

		if (!ns_capable(ns->user_ns, CAP_SYS_ADMIN))

			return ERR_PTR(-EPERM);

	}



	sb = sget(fs_type, proc_test_super, proc_set_super, flags, ns);

	if (IS_ERR(sb))

		return ERR_CAST(sb);



	if (!proc_parse_options(options, ns)) {

		deactivate_locked_super(sb);

		return ERR_PTR(-EINVAL);

	}



	if (!sb->s_root) {

		err = proc_fill_super(sb);

		if (err) {

			deactivate_locked_super(sb);

			return ERR_PTR(err);

		}



		sb->s_flags |= MS_ACTIVE;

		/* User space would break if executables appear on proc */

		sb->s_iflags |= SB_I_NOEXEC;

	}

	}





	return mount_ns(fs_type, flags, data, ns, ns->user_ns, proc_fill_super);

	return dget(sb->s_root);

}

}





static void proc_kill_sb(struct super_block *sb)

static void proc_kill_sb(struct super_block *sb)