2005-04-17 00:20:36 +02:00
|
|
|
/* -*- linux-c -*- --------------------------------------------------------- *
|
|
|
|
*
|
|
|
|
* linux/fs/devpts/inode.c
|
|
|
|
*
|
|
|
|
* Copyright 1998-2004 H. Peter Anvin -- All Rights Reserved
|
|
|
|
*
|
|
|
|
* This file is part of the Linux kernel and is made available under
|
|
|
|
* the terms of the GNU General Public License, version 2, or at your
|
|
|
|
* option, any later version, incorporated herein by reference.
|
|
|
|
*
|
|
|
|
* ------------------------------------------------------------------------- */
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/fs.h>
|
|
|
|
#include <linux/sched.h>
|
|
|
|
#include <linux/namei.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 09:04:11 +01:00
|
|
|
#include <linux/slab.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
#include <linux/mount.h>
|
|
|
|
#include <linux/tty.h>
|
2008-04-30 09:54:21 +02:00
|
|
|
#include <linux/mutex.h>
|
2009-09-23 01:43:33 +02:00
|
|
|
#include <linux/magic.h>
|
2008-04-30 09:54:21 +02:00
|
|
|
#include <linux/idr.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
#include <linux/devpts_fs.h>
|
2006-03-23 12:00:59 +01:00
|
|
|
#include <linux/parser.h>
|
2007-05-08 09:24:18 +02:00
|
|
|
#include <linux/fsnotify.h>
|
2008-02-08 13:21:41 +01:00
|
|
|
#include <linux/seq_file.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2008-02-08 13:21:41 +01:00
|
|
|
#define DEVPTS_DEFAULT_MODE 0600
|
2009-01-02 14:42:02 +01:00
|
|
|
/*
|
|
|
|
* ptmx is a new node in /dev/pts and will be unused in legacy (single-
|
|
|
|
* instance) mode. To prevent surprises in user space, set permissions of
|
|
|
|
* ptmx to 0. Use 'chmod' or remount with '-o ptmxmode' to set meaningful
|
|
|
|
* permissions.
|
|
|
|
*/
|
|
|
|
#define DEVPTS_DEFAULT_PTMX_MODE 0000
|
2008-10-13 11:43:08 +02:00
|
|
|
#define PTMX_MINOR 2
|
2008-02-08 13:21:41 +01:00
|
|
|
|
2012-01-05 10:06:02 +01:00
|
|
|
/*
|
|
|
|
* sysctl support for setting limits on the number of Unix98 ptys allocated.
|
|
|
|
* Otherwise one can eat up all kernel memory by opening /dev/ptmx repeatedly.
|
|
|
|
*/
|
|
|
|
static int pty_limit = NR_UNIX98_PTY_DEFAULT;
|
2012-01-05 10:06:11 +01:00
|
|
|
static int pty_reserve = NR_UNIX98_PTY_RESERVE;
|
2012-01-05 10:06:02 +01:00
|
|
|
static int pty_limit_min;
|
2012-01-05 10:06:11 +01:00
|
|
|
static int pty_limit_max = INT_MAX;
|
2012-01-05 10:06:02 +01:00
|
|
|
static int pty_count;
|
|
|
|
|
|
|
|
static struct ctl_table pty_table[] = {
|
|
|
|
{
|
|
|
|
.procname = "max",
|
|
|
|
.maxlen = sizeof(int),
|
|
|
|
.mode = 0644,
|
|
|
|
.data = &pty_limit,
|
|
|
|
.proc_handler = proc_dointvec_minmax,
|
|
|
|
.extra1 = &pty_limit_min,
|
|
|
|
.extra2 = &pty_limit_max,
|
2012-01-05 10:06:11 +01:00
|
|
|
}, {
|
|
|
|
.procname = "reserve",
|
|
|
|
.maxlen = sizeof(int),
|
|
|
|
.mode = 0644,
|
|
|
|
.data = &pty_reserve,
|
|
|
|
.proc_handler = proc_dointvec_minmax,
|
|
|
|
.extra1 = &pty_limit_min,
|
|
|
|
.extra2 = &pty_limit_max,
|
2012-01-05 10:06:02 +01:00
|
|
|
}, {
|
|
|
|
.procname = "nr",
|
|
|
|
.maxlen = sizeof(int),
|
|
|
|
.mode = 0444,
|
|
|
|
.data = &pty_count,
|
|
|
|
.proc_handler = proc_dointvec,
|
|
|
|
},
|
|
|
|
{}
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct ctl_table pty_kern_table[] = {
|
|
|
|
{
|
|
|
|
.procname = "pty",
|
|
|
|
.mode = 0555,
|
|
|
|
.child = pty_table,
|
|
|
|
},
|
|
|
|
{}
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct ctl_table pty_root_table[] = {
|
|
|
|
{
|
|
|
|
.procname = "kernel",
|
|
|
|
.mode = 0555,
|
|
|
|
.child = pty_kern_table,
|
|
|
|
},
|
|
|
|
{}
|
|
|
|
};
|
|
|
|
|
2008-04-30 09:54:21 +02:00
|
|
|
static DEFINE_MUTEX(allocated_ptys_lock);
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
static struct vfsmount *devpts_mnt;
|
|
|
|
|
2009-01-02 14:41:33 +01:00
|
|
|
struct pts_mount_opts {
|
2005-04-17 00:20:36 +02:00
|
|
|
int setuid;
|
|
|
|
int setgid;
|
2012-02-08 01:22:56 +01:00
|
|
|
kuid_t uid;
|
|
|
|
kgid_t gid;
|
2005-04-17 00:20:36 +02:00
|
|
|
umode_t mode;
|
2009-01-02 14:42:02 +01:00
|
|
|
umode_t ptmxmode;
|
Enable multiple instances of devpts
To support containers, allow multiple instances of devpts filesystem, such
that indices of ptys allocated in one instance are independent of ptys
allocated in other instances of devpts.
But to preserve backward compatibility, enable this support for multiple
instances only if:
- CONFIG_DEVPTS_MULTIPLE_INSTANCES is set to Y, and
- '-o newinstance' mount option is specified while mounting devpts
To use multi-instance mount, a container startup script could:
$ ns_exec -cm /bin/bash
$ umount /dev/pts
$ mount -t devpts -o newinstance lxcpts /dev/pts
$ mount -o bind /dev/pts/ptmx /dev/ptmx
$ /usr/sbin/sshd -p 1234
where 'ns_exec -cm /bin/bash' is calls clone() with CLONE_NEWNS flag and execs
/bin/bash in the child process. A pty created by the sshd is not visible in
the original mount of /dev/pts.
USER-SPACE-IMPACT:
- See Documentation/fs/devpts.txt (included in next patch) for user-
space impact in multi-instance and mixed-mode operation.
TODO:
- Update mount(8), pts(4) man pages. Highlight impact of not
redirecting /dev/ptmx to /dev/pts/ptmx after a multi-instance mount.
Changelog[v6]:
- [Dave Hansen] Use new get_init_pts_sb() interface
- [Serge Hallyn] Don't bother displaying 'newinstance' in show_options
- [Serge Hallyn] Use macros (PARSE_REMOUNT/PARSE_MOUNT) instead of 0/1.
- [Serge Hallyn] Check error return from get_sb_single() (now
get_init_pts_sb())
- devpts_pty_kill(): don't dput error dentries
Changelog[v5]:
- Move get_sb_ref() definition to earlier patch
- Move usage info to Documentation/filesystems/devpts.txt (next patch)
- Make ptmx node even in init_pts_ns, now that default mode is 0000
(defined in earlier patch, enabled here).
- Cache ptmx dentry and use to update mode during remount
(defined in earlier patch, enabled here).
- Bugfix: explicitly ignore newinstance on remount (if newinstance was
specified on remount of initial mount, it would be ignored but
/proc/mounts would imply that the option was set)
Changelog[v4]:
- Update patch description to address H. Peter Anvin's comments
- Consolidate multi-instance mode code under new config token,
CONFIG_DEVPTS_MULTIPLE_INSTANCE.
- Move usage-details from patch description to
Documentation/fs/devpts.txt
Changelog[v3]:
- Rename new mount option to 'newinstance'
- Create ptmx nodes only in 'newinstance' mounts
- Bugfix: parse_mount_options() modifies @data but since we need to
parse the @data twice (once in devpts_get_sb() and once during
do_remount_sb()), parse a local copy of @data in devpts_get_sb().
(restructured code in devpts_get_sb() to fix this)
Changelog[v2]:
- Support both single-mount and multiple-mount semantics and
provide '-onewmnt' option to select the semantics.
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-01-02 14:42:27 +01:00
|
|
|
int newinstance;
|
2012-01-05 10:06:11 +01:00
|
|
|
int max;
|
2009-01-02 14:41:33 +01:00
|
|
|
};
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2006-03-23 12:00:59 +01:00
|
|
|
enum {
|
2012-01-05 10:06:11 +01:00
|
|
|
Opt_uid, Opt_gid, Opt_mode, Opt_ptmxmode, Opt_newinstance, Opt_max,
|
2006-03-23 12:00:59 +01:00
|
|
|
Opt_err
|
|
|
|
};
|
|
|
|
|
2008-10-13 11:46:57 +02:00
|
|
|
static const match_table_t tokens = {
|
2006-03-23 12:00:59 +01:00
|
|
|
{Opt_uid, "uid=%u"},
|
|
|
|
{Opt_gid, "gid=%u"},
|
|
|
|
{Opt_mode, "mode=%o"},
|
2009-01-02 14:42:02 +01:00
|
|
|
#ifdef CONFIG_DEVPTS_MULTIPLE_INSTANCES
|
|
|
|
{Opt_ptmxmode, "ptmxmode=%o"},
|
Enable multiple instances of devpts
To support containers, allow multiple instances of devpts filesystem, such
that indices of ptys allocated in one instance are independent of ptys
allocated in other instances of devpts.
But to preserve backward compatibility, enable this support for multiple
instances only if:
- CONFIG_DEVPTS_MULTIPLE_INSTANCES is set to Y, and
- '-o newinstance' mount option is specified while mounting devpts
To use multi-instance mount, a container startup script could:
$ ns_exec -cm /bin/bash
$ umount /dev/pts
$ mount -t devpts -o newinstance lxcpts /dev/pts
$ mount -o bind /dev/pts/ptmx /dev/ptmx
$ /usr/sbin/sshd -p 1234
where 'ns_exec -cm /bin/bash' is calls clone() with CLONE_NEWNS flag and execs
/bin/bash in the child process. A pty created by the sshd is not visible in
the original mount of /dev/pts.
USER-SPACE-IMPACT:
- See Documentation/fs/devpts.txt (included in next patch) for user-
space impact in multi-instance and mixed-mode operation.
TODO:
- Update mount(8), pts(4) man pages. Highlight impact of not
redirecting /dev/ptmx to /dev/pts/ptmx after a multi-instance mount.
Changelog[v6]:
- [Dave Hansen] Use new get_init_pts_sb() interface
- [Serge Hallyn] Don't bother displaying 'newinstance' in show_options
- [Serge Hallyn] Use macros (PARSE_REMOUNT/PARSE_MOUNT) instead of 0/1.
- [Serge Hallyn] Check error return from get_sb_single() (now
get_init_pts_sb())
- devpts_pty_kill(): don't dput error dentries
Changelog[v5]:
- Move get_sb_ref() definition to earlier patch
- Move usage info to Documentation/filesystems/devpts.txt (next patch)
- Make ptmx node even in init_pts_ns, now that default mode is 0000
(defined in earlier patch, enabled here).
- Cache ptmx dentry and use to update mode during remount
(defined in earlier patch, enabled here).
- Bugfix: explicitly ignore newinstance on remount (if newinstance was
specified on remount of initial mount, it would be ignored but
/proc/mounts would imply that the option was set)
Changelog[v4]:
- Update patch description to address H. Peter Anvin's comments
- Consolidate multi-instance mode code under new config token,
CONFIG_DEVPTS_MULTIPLE_INSTANCE.
- Move usage-details from patch description to
Documentation/fs/devpts.txt
Changelog[v3]:
- Rename new mount option to 'newinstance'
- Create ptmx nodes only in 'newinstance' mounts
- Bugfix: parse_mount_options() modifies @data but since we need to
parse the @data twice (once in devpts_get_sb() and once during
do_remount_sb()), parse a local copy of @data in devpts_get_sb().
(restructured code in devpts_get_sb() to fix this)
Changelog[v2]:
- Support both single-mount and multiple-mount semantics and
provide '-onewmnt' option to select the semantics.
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-01-02 14:42:27 +01:00
|
|
|
{Opt_newinstance, "newinstance"},
|
2012-01-05 10:06:11 +01:00
|
|
|
{Opt_max, "max=%d"},
|
2009-01-02 14:42:02 +01:00
|
|
|
#endif
|
2006-03-23 12:00:59 +01:00
|
|
|
{Opt_err, NULL}
|
|
|
|
};
|
|
|
|
|
2009-01-02 14:41:21 +01:00
|
|
|
struct pts_fs_info {
|
|
|
|
struct ida allocated_ptys;
|
2009-01-02 14:41:33 +01:00
|
|
|
struct pts_mount_opts mount_opts;
|
2009-01-02 14:42:02 +01:00
|
|
|
struct dentry *ptmx_dentry;
|
2009-01-02 14:41:21 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
static inline struct pts_fs_info *DEVPTS_SB(struct super_block *sb)
|
|
|
|
{
|
|
|
|
return sb->s_fs_info;
|
|
|
|
}
|
|
|
|
|
2009-01-02 14:41:11 +01:00
|
|
|
static inline struct super_block *pts_sb_from_inode(struct inode *inode)
|
|
|
|
{
|
Enable multiple instances of devpts
To support containers, allow multiple instances of devpts filesystem, such
that indices of ptys allocated in one instance are independent of ptys
allocated in other instances of devpts.
But to preserve backward compatibility, enable this support for multiple
instances only if:
- CONFIG_DEVPTS_MULTIPLE_INSTANCES is set to Y, and
- '-o newinstance' mount option is specified while mounting devpts
To use multi-instance mount, a container startup script could:
$ ns_exec -cm /bin/bash
$ umount /dev/pts
$ mount -t devpts -o newinstance lxcpts /dev/pts
$ mount -o bind /dev/pts/ptmx /dev/ptmx
$ /usr/sbin/sshd -p 1234
where 'ns_exec -cm /bin/bash' is calls clone() with CLONE_NEWNS flag and execs
/bin/bash in the child process. A pty created by the sshd is not visible in
the original mount of /dev/pts.
USER-SPACE-IMPACT:
- See Documentation/fs/devpts.txt (included in next patch) for user-
space impact in multi-instance and mixed-mode operation.
TODO:
- Update mount(8), pts(4) man pages. Highlight impact of not
redirecting /dev/ptmx to /dev/pts/ptmx after a multi-instance mount.
Changelog[v6]:
- [Dave Hansen] Use new get_init_pts_sb() interface
- [Serge Hallyn] Don't bother displaying 'newinstance' in show_options
- [Serge Hallyn] Use macros (PARSE_REMOUNT/PARSE_MOUNT) instead of 0/1.
- [Serge Hallyn] Check error return from get_sb_single() (now
get_init_pts_sb())
- devpts_pty_kill(): don't dput error dentries
Changelog[v5]:
- Move get_sb_ref() definition to earlier patch
- Move usage info to Documentation/filesystems/devpts.txt (next patch)
- Make ptmx node even in init_pts_ns, now that default mode is 0000
(defined in earlier patch, enabled here).
- Cache ptmx dentry and use to update mode during remount
(defined in earlier patch, enabled here).
- Bugfix: explicitly ignore newinstance on remount (if newinstance was
specified on remount of initial mount, it would be ignored but
/proc/mounts would imply that the option was set)
Changelog[v4]:
- Update patch description to address H. Peter Anvin's comments
- Consolidate multi-instance mode code under new config token,
CONFIG_DEVPTS_MULTIPLE_INSTANCE.
- Move usage-details from patch description to
Documentation/fs/devpts.txt
Changelog[v3]:
- Rename new mount option to 'newinstance'
- Create ptmx nodes only in 'newinstance' mounts
- Bugfix: parse_mount_options() modifies @data but since we need to
parse the @data twice (once in devpts_get_sb() and once during
do_remount_sb()), parse a local copy of @data in devpts_get_sb().
(restructured code in devpts_get_sb() to fix this)
Changelog[v2]:
- Support both single-mount and multiple-mount semantics and
provide '-onewmnt' option to select the semantics.
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-01-02 14:42:27 +01:00
|
|
|
#ifdef CONFIG_DEVPTS_MULTIPLE_INSTANCES
|
2009-01-02 14:41:11 +01:00
|
|
|
if (inode->i_sb->s_magic == DEVPTS_SUPER_MAGIC)
|
|
|
|
return inode->i_sb;
|
Enable multiple instances of devpts
To support containers, allow multiple instances of devpts filesystem, such
that indices of ptys allocated in one instance are independent of ptys
allocated in other instances of devpts.
But to preserve backward compatibility, enable this support for multiple
instances only if:
- CONFIG_DEVPTS_MULTIPLE_INSTANCES is set to Y, and
- '-o newinstance' mount option is specified while mounting devpts
To use multi-instance mount, a container startup script could:
$ ns_exec -cm /bin/bash
$ umount /dev/pts
$ mount -t devpts -o newinstance lxcpts /dev/pts
$ mount -o bind /dev/pts/ptmx /dev/ptmx
$ /usr/sbin/sshd -p 1234
where 'ns_exec -cm /bin/bash' is calls clone() with CLONE_NEWNS flag and execs
/bin/bash in the child process. A pty created by the sshd is not visible in
the original mount of /dev/pts.
USER-SPACE-IMPACT:
- See Documentation/fs/devpts.txt (included in next patch) for user-
space impact in multi-instance and mixed-mode operation.
TODO:
- Update mount(8), pts(4) man pages. Highlight impact of not
redirecting /dev/ptmx to /dev/pts/ptmx after a multi-instance mount.
Changelog[v6]:
- [Dave Hansen] Use new get_init_pts_sb() interface
- [Serge Hallyn] Don't bother displaying 'newinstance' in show_options
- [Serge Hallyn] Use macros (PARSE_REMOUNT/PARSE_MOUNT) instead of 0/1.
- [Serge Hallyn] Check error return from get_sb_single() (now
get_init_pts_sb())
- devpts_pty_kill(): don't dput error dentries
Changelog[v5]:
- Move get_sb_ref() definition to earlier patch
- Move usage info to Documentation/filesystems/devpts.txt (next patch)
- Make ptmx node even in init_pts_ns, now that default mode is 0000
(defined in earlier patch, enabled here).
- Cache ptmx dentry and use to update mode during remount
(defined in earlier patch, enabled here).
- Bugfix: explicitly ignore newinstance on remount (if newinstance was
specified on remount of initial mount, it would be ignored but
/proc/mounts would imply that the option was set)
Changelog[v4]:
- Update patch description to address H. Peter Anvin's comments
- Consolidate multi-instance mode code under new config token,
CONFIG_DEVPTS_MULTIPLE_INSTANCE.
- Move usage-details from patch description to
Documentation/fs/devpts.txt
Changelog[v3]:
- Rename new mount option to 'newinstance'
- Create ptmx nodes only in 'newinstance' mounts
- Bugfix: parse_mount_options() modifies @data but since we need to
parse the @data twice (once in devpts_get_sb() and once during
do_remount_sb()), parse a local copy of @data in devpts_get_sb().
(restructured code in devpts_get_sb() to fix this)
Changelog[v2]:
- Support both single-mount and multiple-mount semantics and
provide '-onewmnt' option to select the semantics.
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-01-02 14:42:27 +01:00
|
|
|
#endif
|
2009-01-02 14:41:11 +01:00
|
|
|
return devpts_mnt->mnt_sb;
|
|
|
|
}
|
|
|
|
|
Enable multiple instances of devpts
To support containers, allow multiple instances of devpts filesystem, such
that indices of ptys allocated in one instance are independent of ptys
allocated in other instances of devpts.
But to preserve backward compatibility, enable this support for multiple
instances only if:
- CONFIG_DEVPTS_MULTIPLE_INSTANCES is set to Y, and
- '-o newinstance' mount option is specified while mounting devpts
To use multi-instance mount, a container startup script could:
$ ns_exec -cm /bin/bash
$ umount /dev/pts
$ mount -t devpts -o newinstance lxcpts /dev/pts
$ mount -o bind /dev/pts/ptmx /dev/ptmx
$ /usr/sbin/sshd -p 1234
where 'ns_exec -cm /bin/bash' is calls clone() with CLONE_NEWNS flag and execs
/bin/bash in the child process. A pty created by the sshd is not visible in
the original mount of /dev/pts.
USER-SPACE-IMPACT:
- See Documentation/fs/devpts.txt (included in next patch) for user-
space impact in multi-instance and mixed-mode operation.
TODO:
- Update mount(8), pts(4) man pages. Highlight impact of not
redirecting /dev/ptmx to /dev/pts/ptmx after a multi-instance mount.
Changelog[v6]:
- [Dave Hansen] Use new get_init_pts_sb() interface
- [Serge Hallyn] Don't bother displaying 'newinstance' in show_options
- [Serge Hallyn] Use macros (PARSE_REMOUNT/PARSE_MOUNT) instead of 0/1.
- [Serge Hallyn] Check error return from get_sb_single() (now
get_init_pts_sb())
- devpts_pty_kill(): don't dput error dentries
Changelog[v5]:
- Move get_sb_ref() definition to earlier patch
- Move usage info to Documentation/filesystems/devpts.txt (next patch)
- Make ptmx node even in init_pts_ns, now that default mode is 0000
(defined in earlier patch, enabled here).
- Cache ptmx dentry and use to update mode during remount
(defined in earlier patch, enabled here).
- Bugfix: explicitly ignore newinstance on remount (if newinstance was
specified on remount of initial mount, it would be ignored but
/proc/mounts would imply that the option was set)
Changelog[v4]:
- Update patch description to address H. Peter Anvin's comments
- Consolidate multi-instance mode code under new config token,
CONFIG_DEVPTS_MULTIPLE_INSTANCE.
- Move usage-details from patch description to
Documentation/fs/devpts.txt
Changelog[v3]:
- Rename new mount option to 'newinstance'
- Create ptmx nodes only in 'newinstance' mounts
- Bugfix: parse_mount_options() modifies @data but since we need to
parse the @data twice (once in devpts_get_sb() and once during
do_remount_sb()), parse a local copy of @data in devpts_get_sb().
(restructured code in devpts_get_sb() to fix this)
Changelog[v2]:
- Support both single-mount and multiple-mount semantics and
provide '-onewmnt' option to select the semantics.
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-01-02 14:42:27 +01:00
|
|
|
#define PARSE_MOUNT 0
|
|
|
|
#define PARSE_REMOUNT 1
|
|
|
|
|
2009-05-15 04:38:24 +02:00
|
|
|
/*
|
|
|
|
* parse_mount_options():
|
|
|
|
* Set @opts to mount options specified in @data. If an option is not
|
|
|
|
* specified in @data, set it to its default value. The exception is
|
|
|
|
* 'newinstance' option which can only be set/cleared on a mount (i.e.
|
|
|
|
* cannot be changed during remount).
|
|
|
|
*
|
|
|
|
* Note: @data may be NULL (in which case all options are set to default).
|
|
|
|
*/
|
Enable multiple instances of devpts
To support containers, allow multiple instances of devpts filesystem, such
that indices of ptys allocated in one instance are independent of ptys
allocated in other instances of devpts.
But to preserve backward compatibility, enable this support for multiple
instances only if:
- CONFIG_DEVPTS_MULTIPLE_INSTANCES is set to Y, and
- '-o newinstance' mount option is specified while mounting devpts
To use multi-instance mount, a container startup script could:
$ ns_exec -cm /bin/bash
$ umount /dev/pts
$ mount -t devpts -o newinstance lxcpts /dev/pts
$ mount -o bind /dev/pts/ptmx /dev/ptmx
$ /usr/sbin/sshd -p 1234
where 'ns_exec -cm /bin/bash' is calls clone() with CLONE_NEWNS flag and execs
/bin/bash in the child process. A pty created by the sshd is not visible in
the original mount of /dev/pts.
USER-SPACE-IMPACT:
- See Documentation/fs/devpts.txt (included in next patch) for user-
space impact in multi-instance and mixed-mode operation.
TODO:
- Update mount(8), pts(4) man pages. Highlight impact of not
redirecting /dev/ptmx to /dev/pts/ptmx after a multi-instance mount.
Changelog[v6]:
- [Dave Hansen] Use new get_init_pts_sb() interface
- [Serge Hallyn] Don't bother displaying 'newinstance' in show_options
- [Serge Hallyn] Use macros (PARSE_REMOUNT/PARSE_MOUNT) instead of 0/1.
- [Serge Hallyn] Check error return from get_sb_single() (now
get_init_pts_sb())
- devpts_pty_kill(): don't dput error dentries
Changelog[v5]:
- Move get_sb_ref() definition to earlier patch
- Move usage info to Documentation/filesystems/devpts.txt (next patch)
- Make ptmx node even in init_pts_ns, now that default mode is 0000
(defined in earlier patch, enabled here).
- Cache ptmx dentry and use to update mode during remount
(defined in earlier patch, enabled here).
- Bugfix: explicitly ignore newinstance on remount (if newinstance was
specified on remount of initial mount, it would be ignored but
/proc/mounts would imply that the option was set)
Changelog[v4]:
- Update patch description to address H. Peter Anvin's comments
- Consolidate multi-instance mode code under new config token,
CONFIG_DEVPTS_MULTIPLE_INSTANCE.
- Move usage-details from patch description to
Documentation/fs/devpts.txt
Changelog[v3]:
- Rename new mount option to 'newinstance'
- Create ptmx nodes only in 'newinstance' mounts
- Bugfix: parse_mount_options() modifies @data but since we need to
parse the @data twice (once in devpts_get_sb() and once during
do_remount_sb()), parse a local copy of @data in devpts_get_sb().
(restructured code in devpts_get_sb() to fix this)
Changelog[v2]:
- Support both single-mount and multiple-mount semantics and
provide '-onewmnt' option to select the semantics.
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-01-02 14:42:27 +01:00
|
|
|
static int parse_mount_options(char *data, int op, struct pts_mount_opts *opts)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2006-03-23 12:00:59 +01:00
|
|
|
char *p;
|
2012-02-08 01:22:56 +01:00
|
|
|
kuid_t uid;
|
|
|
|
kgid_t gid;
|
2006-03-23 12:00:59 +01:00
|
|
|
|
2009-01-02 14:41:33 +01:00
|
|
|
opts->setuid = 0;
|
|
|
|
opts->setgid = 0;
|
2012-02-08 01:22:56 +01:00
|
|
|
opts->uid = GLOBAL_ROOT_UID;
|
|
|
|
opts->gid = GLOBAL_ROOT_GID;
|
2009-01-02 14:41:33 +01:00
|
|
|
opts->mode = DEVPTS_DEFAULT_MODE;
|
2009-01-02 14:42:02 +01:00
|
|
|
opts->ptmxmode = DEVPTS_DEFAULT_PTMX_MODE;
|
2012-01-05 10:06:11 +01:00
|
|
|
opts->max = NR_UNIX98_PTY_MAX;
|
2006-03-23 12:00:59 +01:00
|
|
|
|
Enable multiple instances of devpts
To support containers, allow multiple instances of devpts filesystem, such
that indices of ptys allocated in one instance are independent of ptys
allocated in other instances of devpts.
But to preserve backward compatibility, enable this support for multiple
instances only if:
- CONFIG_DEVPTS_MULTIPLE_INSTANCES is set to Y, and
- '-o newinstance' mount option is specified while mounting devpts
To use multi-instance mount, a container startup script could:
$ ns_exec -cm /bin/bash
$ umount /dev/pts
$ mount -t devpts -o newinstance lxcpts /dev/pts
$ mount -o bind /dev/pts/ptmx /dev/ptmx
$ /usr/sbin/sshd -p 1234
where 'ns_exec -cm /bin/bash' is calls clone() with CLONE_NEWNS flag and execs
/bin/bash in the child process. A pty created by the sshd is not visible in
the original mount of /dev/pts.
USER-SPACE-IMPACT:
- See Documentation/fs/devpts.txt (included in next patch) for user-
space impact in multi-instance and mixed-mode operation.
TODO:
- Update mount(8), pts(4) man pages. Highlight impact of not
redirecting /dev/ptmx to /dev/pts/ptmx after a multi-instance mount.
Changelog[v6]:
- [Dave Hansen] Use new get_init_pts_sb() interface
- [Serge Hallyn] Don't bother displaying 'newinstance' in show_options
- [Serge Hallyn] Use macros (PARSE_REMOUNT/PARSE_MOUNT) instead of 0/1.
- [Serge Hallyn] Check error return from get_sb_single() (now
get_init_pts_sb())
- devpts_pty_kill(): don't dput error dentries
Changelog[v5]:
- Move get_sb_ref() definition to earlier patch
- Move usage info to Documentation/filesystems/devpts.txt (next patch)
- Make ptmx node even in init_pts_ns, now that default mode is 0000
(defined in earlier patch, enabled here).
- Cache ptmx dentry and use to update mode during remount
(defined in earlier patch, enabled here).
- Bugfix: explicitly ignore newinstance on remount (if newinstance was
specified on remount of initial mount, it would be ignored but
/proc/mounts would imply that the option was set)
Changelog[v4]:
- Update patch description to address H. Peter Anvin's comments
- Consolidate multi-instance mode code under new config token,
CONFIG_DEVPTS_MULTIPLE_INSTANCE.
- Move usage-details from patch description to
Documentation/fs/devpts.txt
Changelog[v3]:
- Rename new mount option to 'newinstance'
- Create ptmx nodes only in 'newinstance' mounts
- Bugfix: parse_mount_options() modifies @data but since we need to
parse the @data twice (once in devpts_get_sb() and once during
do_remount_sb()), parse a local copy of @data in devpts_get_sb().
(restructured code in devpts_get_sb() to fix this)
Changelog[v2]:
- Support both single-mount and multiple-mount semantics and
provide '-onewmnt' option to select the semantics.
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-01-02 14:42:27 +01:00
|
|
|
/* newinstance makes sense only on initial mount */
|
|
|
|
if (op == PARSE_MOUNT)
|
|
|
|
opts->newinstance = 0;
|
|
|
|
|
2006-03-23 12:00:59 +01:00
|
|
|
while ((p = strsep(&data, ",")) != NULL) {
|
|
|
|
substring_t args[MAX_OPT_ARGS];
|
|
|
|
int token;
|
|
|
|
int option;
|
|
|
|
|
|
|
|
if (!*p)
|
2005-04-17 00:20:36 +02:00
|
|
|
continue;
|
2006-03-23 12:00:59 +01:00
|
|
|
|
|
|
|
token = match_token(p, tokens, args);
|
|
|
|
switch (token) {
|
|
|
|
case Opt_uid:
|
|
|
|
if (match_int(&args[0], &option))
|
|
|
|
return -EINVAL;
|
2012-02-08 01:22:56 +01:00
|
|
|
uid = make_kuid(current_user_ns(), option);
|
|
|
|
if (!uid_valid(uid))
|
|
|
|
return -EINVAL;
|
|
|
|
opts->uid = uid;
|
2009-01-02 14:41:33 +01:00
|
|
|
opts->setuid = 1;
|
2006-03-23 12:00:59 +01:00
|
|
|
break;
|
|
|
|
case Opt_gid:
|
|
|
|
if (match_int(&args[0], &option))
|
|
|
|
return -EINVAL;
|
2012-02-08 01:22:56 +01:00
|
|
|
gid = make_kgid(current_user_ns(), option);
|
|
|
|
if (!gid_valid(gid))
|
|
|
|
return -EINVAL;
|
|
|
|
opts->gid = gid;
|
2009-01-02 14:41:33 +01:00
|
|
|
opts->setgid = 1;
|
2006-03-23 12:00:59 +01:00
|
|
|
break;
|
|
|
|
case Opt_mode:
|
|
|
|
if (match_octal(&args[0], &option))
|
|
|
|
return -EINVAL;
|
2009-01-02 14:41:33 +01:00
|
|
|
opts->mode = option & S_IALLUGO;
|
2006-03-23 12:00:59 +01:00
|
|
|
break;
|
2009-01-02 14:42:02 +01:00
|
|
|
#ifdef CONFIG_DEVPTS_MULTIPLE_INSTANCES
|
|
|
|
case Opt_ptmxmode:
|
|
|
|
if (match_octal(&args[0], &option))
|
|
|
|
return -EINVAL;
|
|
|
|
opts->ptmxmode = option & S_IALLUGO;
|
|
|
|
break;
|
Enable multiple instances of devpts
To support containers, allow multiple instances of devpts filesystem, such
that indices of ptys allocated in one instance are independent of ptys
allocated in other instances of devpts.
But to preserve backward compatibility, enable this support for multiple
instances only if:
- CONFIG_DEVPTS_MULTIPLE_INSTANCES is set to Y, and
- '-o newinstance' mount option is specified while mounting devpts
To use multi-instance mount, a container startup script could:
$ ns_exec -cm /bin/bash
$ umount /dev/pts
$ mount -t devpts -o newinstance lxcpts /dev/pts
$ mount -o bind /dev/pts/ptmx /dev/ptmx
$ /usr/sbin/sshd -p 1234
where 'ns_exec -cm /bin/bash' is calls clone() with CLONE_NEWNS flag and execs
/bin/bash in the child process. A pty created by the sshd is not visible in
the original mount of /dev/pts.
USER-SPACE-IMPACT:
- See Documentation/fs/devpts.txt (included in next patch) for user-
space impact in multi-instance and mixed-mode operation.
TODO:
- Update mount(8), pts(4) man pages. Highlight impact of not
redirecting /dev/ptmx to /dev/pts/ptmx after a multi-instance mount.
Changelog[v6]:
- [Dave Hansen] Use new get_init_pts_sb() interface
- [Serge Hallyn] Don't bother displaying 'newinstance' in show_options
- [Serge Hallyn] Use macros (PARSE_REMOUNT/PARSE_MOUNT) instead of 0/1.
- [Serge Hallyn] Check error return from get_sb_single() (now
get_init_pts_sb())
- devpts_pty_kill(): don't dput error dentries
Changelog[v5]:
- Move get_sb_ref() definition to earlier patch
- Move usage info to Documentation/filesystems/devpts.txt (next patch)
- Make ptmx node even in init_pts_ns, now that default mode is 0000
(defined in earlier patch, enabled here).
- Cache ptmx dentry and use to update mode during remount
(defined in earlier patch, enabled here).
- Bugfix: explicitly ignore newinstance on remount (if newinstance was
specified on remount of initial mount, it would be ignored but
/proc/mounts would imply that the option was set)
Changelog[v4]:
- Update patch description to address H. Peter Anvin's comments
- Consolidate multi-instance mode code under new config token,
CONFIG_DEVPTS_MULTIPLE_INSTANCE.
- Move usage-details from patch description to
Documentation/fs/devpts.txt
Changelog[v3]:
- Rename new mount option to 'newinstance'
- Create ptmx nodes only in 'newinstance' mounts
- Bugfix: parse_mount_options() modifies @data but since we need to
parse the @data twice (once in devpts_get_sb() and once during
do_remount_sb()), parse a local copy of @data in devpts_get_sb().
(restructured code in devpts_get_sb() to fix this)
Changelog[v2]:
- Support both single-mount and multiple-mount semantics and
provide '-onewmnt' option to select the semantics.
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-01-02 14:42:27 +01:00
|
|
|
case Opt_newinstance:
|
|
|
|
/* newinstance makes sense only on initial mount */
|
|
|
|
if (op == PARSE_MOUNT)
|
|
|
|
opts->newinstance = 1;
|
|
|
|
break;
|
2012-01-05 10:06:11 +01:00
|
|
|
case Opt_max:
|
|
|
|
if (match_int(&args[0], &option) ||
|
|
|
|
option < 0 || option > NR_UNIX98_PTY_MAX)
|
|
|
|
return -EINVAL;
|
|
|
|
opts->max = option;
|
|
|
|
break;
|
2009-01-02 14:42:02 +01:00
|
|
|
#endif
|
2006-03-23 12:00:59 +01:00
|
|
|
default:
|
|
|
|
printk(KERN_ERR "devpts: called with bogus options\n");
|
2005-04-17 00:20:36 +02:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-01-02 14:42:02 +01:00
|
|
|
#ifdef CONFIG_DEVPTS_MULTIPLE_INSTANCES
|
|
|
|
static int mknod_ptmx(struct super_block *sb)
|
|
|
|
{
|
|
|
|
int mode;
|
|
|
|
int rc = -ENOMEM;
|
|
|
|
struct dentry *dentry;
|
|
|
|
struct inode *inode;
|
|
|
|
struct dentry *root = sb->s_root;
|
|
|
|
struct pts_fs_info *fsi = DEVPTS_SB(sb);
|
|
|
|
struct pts_mount_opts *opts = &fsi->mount_opts;
|
|
|
|
|
|
|
|
mutex_lock(&root->d_inode->i_mutex);
|
|
|
|
|
|
|
|
/* If we have already created ptmx node, return */
|
|
|
|
if (fsi->ptmx_dentry) {
|
|
|
|
rc = 0;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
dentry = d_alloc_name(root, "ptmx");
|
|
|
|
if (!dentry) {
|
|
|
|
printk(KERN_NOTICE "Unable to alloc dentry for ptmx node\n");
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Create a new 'ptmx' node in this mount of devpts.
|
|
|
|
*/
|
|
|
|
inode = new_inode(sb);
|
|
|
|
if (!inode) {
|
|
|
|
printk(KERN_ERR "Unable to alloc inode for ptmx node\n");
|
|
|
|
dput(dentry);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
inode->i_ino = 2;
|
|
|
|
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
|
|
|
|
|
|
|
|
mode = S_IFCHR|opts->ptmxmode;
|
|
|
|
init_special_inode(inode, mode, MKDEV(TTYAUX_MAJOR, 2));
|
|
|
|
|
|
|
|
d_add(dentry, inode);
|
|
|
|
|
|
|
|
fsi->ptmx_dentry = dentry;
|
|
|
|
rc = 0;
|
|
|
|
out:
|
|
|
|
mutex_unlock(&root->d_inode->i_mutex);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void update_ptmx_mode(struct pts_fs_info *fsi)
|
|
|
|
{
|
|
|
|
struct inode *inode;
|
|
|
|
if (fsi->ptmx_dentry) {
|
|
|
|
inode = fsi->ptmx_dentry->d_inode;
|
|
|
|
inode->i_mode = S_IFCHR|fsi->mount_opts.ptmxmode;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
static inline void update_ptmx_mode(struct pts_fs_info *fsi)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2009-01-02 14:41:47 +01:00
|
|
|
static int devpts_remount(struct super_block *sb, int *flags, char *data)
|
|
|
|
{
|
2009-01-02 14:42:02 +01:00
|
|
|
int err;
|
2009-01-02 14:41:47 +01:00
|
|
|
struct pts_fs_info *fsi = DEVPTS_SB(sb);
|
|
|
|
struct pts_mount_opts *opts = &fsi->mount_opts;
|
|
|
|
|
Enable multiple instances of devpts
To support containers, allow multiple instances of devpts filesystem, such
that indices of ptys allocated in one instance are independent of ptys
allocated in other instances of devpts.
But to preserve backward compatibility, enable this support for multiple
instances only if:
- CONFIG_DEVPTS_MULTIPLE_INSTANCES is set to Y, and
- '-o newinstance' mount option is specified while mounting devpts
To use multi-instance mount, a container startup script could:
$ ns_exec -cm /bin/bash
$ umount /dev/pts
$ mount -t devpts -o newinstance lxcpts /dev/pts
$ mount -o bind /dev/pts/ptmx /dev/ptmx
$ /usr/sbin/sshd -p 1234
where 'ns_exec -cm /bin/bash' is calls clone() with CLONE_NEWNS flag and execs
/bin/bash in the child process. A pty created by the sshd is not visible in
the original mount of /dev/pts.
USER-SPACE-IMPACT:
- See Documentation/fs/devpts.txt (included in next patch) for user-
space impact in multi-instance and mixed-mode operation.
TODO:
- Update mount(8), pts(4) man pages. Highlight impact of not
redirecting /dev/ptmx to /dev/pts/ptmx after a multi-instance mount.
Changelog[v6]:
- [Dave Hansen] Use new get_init_pts_sb() interface
- [Serge Hallyn] Don't bother displaying 'newinstance' in show_options
- [Serge Hallyn] Use macros (PARSE_REMOUNT/PARSE_MOUNT) instead of 0/1.
- [Serge Hallyn] Check error return from get_sb_single() (now
get_init_pts_sb())
- devpts_pty_kill(): don't dput error dentries
Changelog[v5]:
- Move get_sb_ref() definition to earlier patch
- Move usage info to Documentation/filesystems/devpts.txt (next patch)
- Make ptmx node even in init_pts_ns, now that default mode is 0000
(defined in earlier patch, enabled here).
- Cache ptmx dentry and use to update mode during remount
(defined in earlier patch, enabled here).
- Bugfix: explicitly ignore newinstance on remount (if newinstance was
specified on remount of initial mount, it would be ignored but
/proc/mounts would imply that the option was set)
Changelog[v4]:
- Update patch description to address H. Peter Anvin's comments
- Consolidate multi-instance mode code under new config token,
CONFIG_DEVPTS_MULTIPLE_INSTANCE.
- Move usage-details from patch description to
Documentation/fs/devpts.txt
Changelog[v3]:
- Rename new mount option to 'newinstance'
- Create ptmx nodes only in 'newinstance' mounts
- Bugfix: parse_mount_options() modifies @data but since we need to
parse the @data twice (once in devpts_get_sb() and once during
do_remount_sb()), parse a local copy of @data in devpts_get_sb().
(restructured code in devpts_get_sb() to fix this)
Changelog[v2]:
- Support both single-mount and multiple-mount semantics and
provide '-onewmnt' option to select the semantics.
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-01-02 14:42:27 +01:00
|
|
|
err = parse_mount_options(data, PARSE_REMOUNT, opts);
|
2009-01-02 14:42:02 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* parse_mount_options() restores options to default values
|
|
|
|
* before parsing and may have changed ptmxmode. So, update the
|
|
|
|
* mode in the inode too. Bogus options don't fail the remount,
|
|
|
|
* so do this even on error return.
|
|
|
|
*/
|
|
|
|
update_ptmx_mode(fsi);
|
|
|
|
|
|
|
|
return err;
|
2009-01-02 14:41:47 +01:00
|
|
|
}
|
|
|
|
|
2011-12-09 03:32:45 +01:00
|
|
|
static int devpts_show_options(struct seq_file *seq, struct dentry *root)
|
2008-02-08 13:21:41 +01:00
|
|
|
{
|
2011-12-09 03:32:45 +01:00
|
|
|
struct pts_fs_info *fsi = DEVPTS_SB(root->d_sb);
|
2009-01-02 14:41:33 +01:00
|
|
|
struct pts_mount_opts *opts = &fsi->mount_opts;
|
|
|
|
|
|
|
|
if (opts->setuid)
|
2012-02-08 01:22:56 +01:00
|
|
|
seq_printf(seq, ",uid=%u", from_kuid_munged(&init_user_ns, opts->uid));
|
2009-01-02 14:41:33 +01:00
|
|
|
if (opts->setgid)
|
2012-02-08 01:22:56 +01:00
|
|
|
seq_printf(seq, ",gid=%u", from_kgid_munged(&init_user_ns, opts->gid));
|
2009-01-02 14:41:33 +01:00
|
|
|
seq_printf(seq, ",mode=%03o", opts->mode);
|
2009-01-02 14:42:02 +01:00
|
|
|
#ifdef CONFIG_DEVPTS_MULTIPLE_INSTANCES
|
|
|
|
seq_printf(seq, ",ptmxmode=%03o", opts->ptmxmode);
|
2012-01-05 10:06:11 +01:00
|
|
|
if (opts->max < NR_UNIX98_PTY_MAX)
|
|
|
|
seq_printf(seq, ",max=%d", opts->max);
|
2009-01-02 14:42:02 +01:00
|
|
|
#endif
|
2008-02-08 13:21:41 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-02-12 09:55:41 +01:00
|
|
|
static const struct super_operations devpts_sops = {
|
2005-04-17 00:20:36 +02:00
|
|
|
.statfs = simple_statfs,
|
|
|
|
.remount_fs = devpts_remount,
|
2008-02-08 13:21:41 +01:00
|
|
|
.show_options = devpts_show_options,
|
2005-04-17 00:20:36 +02:00
|
|
|
};
|
|
|
|
|
2009-01-02 14:41:21 +01:00
|
|
|
static void *new_pts_fs_info(void)
|
|
|
|
{
|
|
|
|
struct pts_fs_info *fsi;
|
|
|
|
|
|
|
|
fsi = kzalloc(sizeof(struct pts_fs_info), GFP_KERNEL);
|
|
|
|
if (!fsi)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
ida_init(&fsi->allocated_ptys);
|
2009-01-02 14:41:33 +01:00
|
|
|
fsi->mount_opts.mode = DEVPTS_DEFAULT_MODE;
|
2009-01-02 14:42:02 +01:00
|
|
|
fsi->mount_opts.ptmxmode = DEVPTS_DEFAULT_PTMX_MODE;
|
2009-01-02 14:41:21 +01:00
|
|
|
|
|
|
|
return fsi;
|
|
|
|
}
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
static int
|
|
|
|
devpts_fill_super(struct super_block *s, void *data, int silent)
|
|
|
|
{
|
2009-01-02 14:42:02 +01:00
|
|
|
struct inode *inode;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
s->s_blocksize = 1024;
|
|
|
|
s->s_blocksize_bits = 10;
|
|
|
|
s->s_magic = DEVPTS_SUPER_MAGIC;
|
|
|
|
s->s_op = &devpts_sops;
|
|
|
|
s->s_time_gran = 1;
|
|
|
|
|
2009-01-02 14:41:21 +01:00
|
|
|
s->s_fs_info = new_pts_fs_info();
|
|
|
|
if (!s->s_fs_info)
|
|
|
|
goto fail;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
inode = new_inode(s);
|
|
|
|
if (!inode)
|
2012-01-09 01:40:27 +01:00
|
|
|
goto fail;
|
2005-04-17 00:20:36 +02:00
|
|
|
inode->i_ino = 1;
|
|
|
|
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
|
|
|
|
inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;
|
|
|
|
inode->i_op = &simple_dir_inode_operations;
|
|
|
|
inode->i_fop = &simple_dir_operations;
|
2011-10-28 14:13:29 +02:00
|
|
|
set_nlink(inode, 2);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2012-01-09 04:15:13 +01:00
|
|
|
s->s_root = d_make_root(inode);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (s->s_root)
|
|
|
|
return 0;
|
2009-01-02 14:42:02 +01:00
|
|
|
|
2009-01-02 14:42:48 +01:00
|
|
|
printk(KERN_ERR "devpts: get root dentry failed\n");
|
2009-01-02 14:41:21 +01:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
fail:
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
2009-01-02 14:44:12 +01:00
|
|
|
#ifdef CONFIG_DEVPTS_MULTIPLE_INSTANCES
|
2009-01-02 14:42:19 +01:00
|
|
|
static int compare_init_pts_sb(struct super_block *s, void *p)
|
|
|
|
{
|
|
|
|
if (devpts_mnt)
|
|
|
|
return devpts_mnt->mnt_sb == s;
|
Enable multiple instances of devpts
To support containers, allow multiple instances of devpts filesystem, such
that indices of ptys allocated in one instance are independent of ptys
allocated in other instances of devpts.
But to preserve backward compatibility, enable this support for multiple
instances only if:
- CONFIG_DEVPTS_MULTIPLE_INSTANCES is set to Y, and
- '-o newinstance' mount option is specified while mounting devpts
To use multi-instance mount, a container startup script could:
$ ns_exec -cm /bin/bash
$ umount /dev/pts
$ mount -t devpts -o newinstance lxcpts /dev/pts
$ mount -o bind /dev/pts/ptmx /dev/ptmx
$ /usr/sbin/sshd -p 1234
where 'ns_exec -cm /bin/bash' is calls clone() with CLONE_NEWNS flag and execs
/bin/bash in the child process. A pty created by the sshd is not visible in
the original mount of /dev/pts.
USER-SPACE-IMPACT:
- See Documentation/fs/devpts.txt (included in next patch) for user-
space impact in multi-instance and mixed-mode operation.
TODO:
- Update mount(8), pts(4) man pages. Highlight impact of not
redirecting /dev/ptmx to /dev/pts/ptmx after a multi-instance mount.
Changelog[v6]:
- [Dave Hansen] Use new get_init_pts_sb() interface
- [Serge Hallyn] Don't bother displaying 'newinstance' in show_options
- [Serge Hallyn] Use macros (PARSE_REMOUNT/PARSE_MOUNT) instead of 0/1.
- [Serge Hallyn] Check error return from get_sb_single() (now
get_init_pts_sb())
- devpts_pty_kill(): don't dput error dentries
Changelog[v5]:
- Move get_sb_ref() definition to earlier patch
- Move usage info to Documentation/filesystems/devpts.txt (next patch)
- Make ptmx node even in init_pts_ns, now that default mode is 0000
(defined in earlier patch, enabled here).
- Cache ptmx dentry and use to update mode during remount
(defined in earlier patch, enabled here).
- Bugfix: explicitly ignore newinstance on remount (if newinstance was
specified on remount of initial mount, it would be ignored but
/proc/mounts would imply that the option was set)
Changelog[v4]:
- Update patch description to address H. Peter Anvin's comments
- Consolidate multi-instance mode code under new config token,
CONFIG_DEVPTS_MULTIPLE_INSTANCE.
- Move usage-details from patch description to
Documentation/fs/devpts.txt
Changelog[v3]:
- Rename new mount option to 'newinstance'
- Create ptmx nodes only in 'newinstance' mounts
- Bugfix: parse_mount_options() modifies @data but since we need to
parse the @data twice (once in devpts_get_sb() and once during
do_remount_sb()), parse a local copy of @data in devpts_get_sb().
(restructured code in devpts_get_sb() to fix this)
Changelog[v2]:
- Support both single-mount and multiple-mount semantics and
provide '-onewmnt' option to select the semantics.
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-01-02 14:42:27 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2010-07-24 23:48:30 +02:00
|
|
|
* devpts_mount()
|
2009-03-07 19:12:32 +01:00
|
|
|
*
|
|
|
|
* If the '-o newinstance' mount option was specified, mount a new
|
|
|
|
* (private) instance of devpts. PTYs created in this instance are
|
|
|
|
* independent of the PTYs in other devpts instances.
|
|
|
|
*
|
|
|
|
* If the '-o newinstance' option was not specified, mount/remount the
|
|
|
|
* initial kernel mount of devpts. This type of mount gives the
|
|
|
|
* legacy, single-instance semantics.
|
2009-03-07 19:12:06 +01:00
|
|
|
*
|
2009-03-07 19:12:32 +01:00
|
|
|
* The 'newinstance' option is needed to support multiple namespace
|
|
|
|
* semantics in devpts while preserving backward compatibility of the
|
|
|
|
* current 'single-namespace' semantics. i.e all mounts of devpts
|
|
|
|
* without the 'newinstance' mount option should bind to the initial
|
2010-07-24 23:48:30 +02:00
|
|
|
* kernel mount, like mount_single().
|
2009-01-02 14:42:19 +01:00
|
|
|
*
|
2009-03-07 19:12:32 +01:00
|
|
|
* Mounts with 'newinstance' option create a new, private namespace.
|
2009-01-02 14:42:19 +01:00
|
|
|
*
|
2009-03-07 19:12:32 +01:00
|
|
|
* NOTE:
|
2009-01-02 14:42:19 +01:00
|
|
|
*
|
2010-07-24 23:48:30 +02:00
|
|
|
* For single-mount semantics, devpts cannot use mount_single(),
|
|
|
|
* because mount_single()/sget() find and use the super-block from
|
2009-01-02 14:42:19 +01:00
|
|
|
* the most recent mount of devpts. But that recent mount may be a
|
2010-07-24 23:48:30 +02:00
|
|
|
* 'newinstance' mount and mount_single() would pick the newinstance
|
2009-01-02 14:42:19 +01:00
|
|
|
* super-block instead of the initial super-block.
|
|
|
|
*/
|
2010-07-24 23:48:30 +02:00
|
|
|
static struct dentry *devpts_mount(struct file_system_type *fs_type,
|
|
|
|
int flags, const char *dev_name, void *data)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2009-03-07 19:14:41 +01:00
|
|
|
int error;
|
|
|
|
struct pts_mount_opts opts;
|
2009-03-07 19:12:32 +01:00
|
|
|
struct super_block *s;
|
Enable multiple instances of devpts
To support containers, allow multiple instances of devpts filesystem, such
that indices of ptys allocated in one instance are independent of ptys
allocated in other instances of devpts.
But to preserve backward compatibility, enable this support for multiple
instances only if:
- CONFIG_DEVPTS_MULTIPLE_INSTANCES is set to Y, and
- '-o newinstance' mount option is specified while mounting devpts
To use multi-instance mount, a container startup script could:
$ ns_exec -cm /bin/bash
$ umount /dev/pts
$ mount -t devpts -o newinstance lxcpts /dev/pts
$ mount -o bind /dev/pts/ptmx /dev/ptmx
$ /usr/sbin/sshd -p 1234
where 'ns_exec -cm /bin/bash' is calls clone() with CLONE_NEWNS flag and execs
/bin/bash in the child process. A pty created by the sshd is not visible in
the original mount of /dev/pts.
USER-SPACE-IMPACT:
- See Documentation/fs/devpts.txt (included in next patch) for user-
space impact in multi-instance and mixed-mode operation.
TODO:
- Update mount(8), pts(4) man pages. Highlight impact of not
redirecting /dev/ptmx to /dev/pts/ptmx after a multi-instance mount.
Changelog[v6]:
- [Dave Hansen] Use new get_init_pts_sb() interface
- [Serge Hallyn] Don't bother displaying 'newinstance' in show_options
- [Serge Hallyn] Use macros (PARSE_REMOUNT/PARSE_MOUNT) instead of 0/1.
- [Serge Hallyn] Check error return from get_sb_single() (now
get_init_pts_sb())
- devpts_pty_kill(): don't dput error dentries
Changelog[v5]:
- Move get_sb_ref() definition to earlier patch
- Move usage info to Documentation/filesystems/devpts.txt (next patch)
- Make ptmx node even in init_pts_ns, now that default mode is 0000
(defined in earlier patch, enabled here).
- Cache ptmx dentry and use to update mode during remount
(defined in earlier patch, enabled here).
- Bugfix: explicitly ignore newinstance on remount (if newinstance was
specified on remount of initial mount, it would be ignored but
/proc/mounts would imply that the option was set)
Changelog[v4]:
- Update patch description to address H. Peter Anvin's comments
- Consolidate multi-instance mode code under new config token,
CONFIG_DEVPTS_MULTIPLE_INSTANCE.
- Move usage-details from patch description to
Documentation/fs/devpts.txt
Changelog[v3]:
- Rename new mount option to 'newinstance'
- Create ptmx nodes only in 'newinstance' mounts
- Bugfix: parse_mount_options() modifies @data but since we need to
parse the @data twice (once in devpts_get_sb() and once during
do_remount_sb()), parse a local copy of @data in devpts_get_sb().
(restructured code in devpts_get_sb() to fix this)
Changelog[v2]:
- Support both single-mount and multiple-mount semantics and
provide '-onewmnt' option to select the semantics.
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-01-02 14:42:27 +01:00
|
|
|
|
2009-05-15 04:38:24 +02:00
|
|
|
error = parse_mount_options(data, PARSE_MOUNT, &opts);
|
|
|
|
if (error)
|
2010-07-24 23:48:30 +02:00
|
|
|
return ERR_PTR(error);
|
Enable multiple instances of devpts
To support containers, allow multiple instances of devpts filesystem, such
that indices of ptys allocated in one instance are independent of ptys
allocated in other instances of devpts.
But to preserve backward compatibility, enable this support for multiple
instances only if:
- CONFIG_DEVPTS_MULTIPLE_INSTANCES is set to Y, and
- '-o newinstance' mount option is specified while mounting devpts
To use multi-instance mount, a container startup script could:
$ ns_exec -cm /bin/bash
$ umount /dev/pts
$ mount -t devpts -o newinstance lxcpts /dev/pts
$ mount -o bind /dev/pts/ptmx /dev/ptmx
$ /usr/sbin/sshd -p 1234
where 'ns_exec -cm /bin/bash' is calls clone() with CLONE_NEWNS flag and execs
/bin/bash in the child process. A pty created by the sshd is not visible in
the original mount of /dev/pts.
USER-SPACE-IMPACT:
- See Documentation/fs/devpts.txt (included in next patch) for user-
space impact in multi-instance and mixed-mode operation.
TODO:
- Update mount(8), pts(4) man pages. Highlight impact of not
redirecting /dev/ptmx to /dev/pts/ptmx after a multi-instance mount.
Changelog[v6]:
- [Dave Hansen] Use new get_init_pts_sb() interface
- [Serge Hallyn] Don't bother displaying 'newinstance' in show_options
- [Serge Hallyn] Use macros (PARSE_REMOUNT/PARSE_MOUNT) instead of 0/1.
- [Serge Hallyn] Check error return from get_sb_single() (now
get_init_pts_sb())
- devpts_pty_kill(): don't dput error dentries
Changelog[v5]:
- Move get_sb_ref() definition to earlier patch
- Move usage info to Documentation/filesystems/devpts.txt (next patch)
- Make ptmx node even in init_pts_ns, now that default mode is 0000
(defined in earlier patch, enabled here).
- Cache ptmx dentry and use to update mode during remount
(defined in earlier patch, enabled here).
- Bugfix: explicitly ignore newinstance on remount (if newinstance was
specified on remount of initial mount, it would be ignored but
/proc/mounts would imply that the option was set)
Changelog[v4]:
- Update patch description to address H. Peter Anvin's comments
- Consolidate multi-instance mode code under new config token,
CONFIG_DEVPTS_MULTIPLE_INSTANCE.
- Move usage-details from patch description to
Documentation/fs/devpts.txt
Changelog[v3]:
- Rename new mount option to 'newinstance'
- Create ptmx nodes only in 'newinstance' mounts
- Bugfix: parse_mount_options() modifies @data but since we need to
parse the @data twice (once in devpts_get_sb() and once during
do_remount_sb()), parse a local copy of @data in devpts_get_sb().
(restructured code in devpts_get_sb() to fix this)
Changelog[v2]:
- Support both single-mount and multiple-mount semantics and
provide '-onewmnt' option to select the semantics.
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-01-02 14:42:27 +01:00
|
|
|
|
2009-03-07 19:14:41 +01:00
|
|
|
if (opts.newinstance)
|
2009-03-07 19:12:32 +01:00
|
|
|
s = sget(fs_type, NULL, set_anon_super, NULL);
|
2009-03-07 19:14:41 +01:00
|
|
|
else
|
2009-03-07 19:12:32 +01:00
|
|
|
s = sget(fs_type, compare_init_pts_sb, set_anon_super, NULL);
|
2009-03-07 19:11:41 +01:00
|
|
|
|
2009-03-07 19:12:32 +01:00
|
|
|
if (IS_ERR(s))
|
2010-07-24 23:48:30 +02:00
|
|
|
return ERR_CAST(s);
|
2009-03-07 19:12:32 +01:00
|
|
|
|
|
|
|
if (!s->s_root) {
|
|
|
|
s->s_flags = flags;
|
|
|
|
error = devpts_fill_super(s, data, flags & MS_SILENT ? 1 : 0);
|
|
|
|
if (error)
|
|
|
|
goto out_undo_sget;
|
|
|
|
s->s_flags |= MS_ACTIVE;
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(&(DEVPTS_SB(s))->mount_opts, &opts, sizeof(opts));
|
2009-03-07 19:11:41 +01:00
|
|
|
|
2009-03-07 19:12:32 +01:00
|
|
|
error = mknod_ptmx(s);
|
2009-03-07 19:11:41 +01:00
|
|
|
if (error)
|
2010-03-21 02:57:43 +01:00
|
|
|
goto out_undo_sget;
|
2009-03-07 19:11:41 +01:00
|
|
|
|
2010-07-24 23:48:30 +02:00
|
|
|
return dget(s->s_root);
|
2009-03-07 19:12:32 +01:00
|
|
|
|
|
|
|
out_undo_sget:
|
2009-05-06 07:34:22 +02:00
|
|
|
deactivate_locked_super(s);
|
2010-07-24 23:48:30 +02:00
|
|
|
return ERR_PTR(error);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
2009-03-07 19:14:41 +01:00
|
|
|
|
Enable multiple instances of devpts
To support containers, allow multiple instances of devpts filesystem, such
that indices of ptys allocated in one instance are independent of ptys
allocated in other instances of devpts.
But to preserve backward compatibility, enable this support for multiple
instances only if:
- CONFIG_DEVPTS_MULTIPLE_INSTANCES is set to Y, and
- '-o newinstance' mount option is specified while mounting devpts
To use multi-instance mount, a container startup script could:
$ ns_exec -cm /bin/bash
$ umount /dev/pts
$ mount -t devpts -o newinstance lxcpts /dev/pts
$ mount -o bind /dev/pts/ptmx /dev/ptmx
$ /usr/sbin/sshd -p 1234
where 'ns_exec -cm /bin/bash' is calls clone() with CLONE_NEWNS flag and execs
/bin/bash in the child process. A pty created by the sshd is not visible in
the original mount of /dev/pts.
USER-SPACE-IMPACT:
- See Documentation/fs/devpts.txt (included in next patch) for user-
space impact in multi-instance and mixed-mode operation.
TODO:
- Update mount(8), pts(4) man pages. Highlight impact of not
redirecting /dev/ptmx to /dev/pts/ptmx after a multi-instance mount.
Changelog[v6]:
- [Dave Hansen] Use new get_init_pts_sb() interface
- [Serge Hallyn] Don't bother displaying 'newinstance' in show_options
- [Serge Hallyn] Use macros (PARSE_REMOUNT/PARSE_MOUNT) instead of 0/1.
- [Serge Hallyn] Check error return from get_sb_single() (now
get_init_pts_sb())
- devpts_pty_kill(): don't dput error dentries
Changelog[v5]:
- Move get_sb_ref() definition to earlier patch
- Move usage info to Documentation/filesystems/devpts.txt (next patch)
- Make ptmx node even in init_pts_ns, now that default mode is 0000
(defined in earlier patch, enabled here).
- Cache ptmx dentry and use to update mode during remount
(defined in earlier patch, enabled here).
- Bugfix: explicitly ignore newinstance on remount (if newinstance was
specified on remount of initial mount, it would be ignored but
/proc/mounts would imply that the option was set)
Changelog[v4]:
- Update patch description to address H. Peter Anvin's comments
- Consolidate multi-instance mode code under new config token,
CONFIG_DEVPTS_MULTIPLE_INSTANCE.
- Move usage-details from patch description to
Documentation/fs/devpts.txt
Changelog[v3]:
- Rename new mount option to 'newinstance'
- Create ptmx nodes only in 'newinstance' mounts
- Bugfix: parse_mount_options() modifies @data but since we need to
parse the @data twice (once in devpts_get_sb() and once during
do_remount_sb()), parse a local copy of @data in devpts_get_sb().
(restructured code in devpts_get_sb() to fix this)
Changelog[v2]:
- Support both single-mount and multiple-mount semantics and
provide '-onewmnt' option to select the semantics.
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-01-02 14:42:27 +01:00
|
|
|
#else
|
|
|
|
/*
|
|
|
|
* This supports only the legacy single-instance semantics (no
|
|
|
|
* multiple-instance semantics)
|
|
|
|
*/
|
2010-07-24 23:48:30 +02:00
|
|
|
static struct dentry *devpts_mount(struct file_system_type *fs_type, int flags,
|
|
|
|
const char *dev_name, void *data)
|
Enable multiple instances of devpts
To support containers, allow multiple instances of devpts filesystem, such
that indices of ptys allocated in one instance are independent of ptys
allocated in other instances of devpts.
But to preserve backward compatibility, enable this support for multiple
instances only if:
- CONFIG_DEVPTS_MULTIPLE_INSTANCES is set to Y, and
- '-o newinstance' mount option is specified while mounting devpts
To use multi-instance mount, a container startup script could:
$ ns_exec -cm /bin/bash
$ umount /dev/pts
$ mount -t devpts -o newinstance lxcpts /dev/pts
$ mount -o bind /dev/pts/ptmx /dev/ptmx
$ /usr/sbin/sshd -p 1234
where 'ns_exec -cm /bin/bash' is calls clone() with CLONE_NEWNS flag and execs
/bin/bash in the child process. A pty created by the sshd is not visible in
the original mount of /dev/pts.
USER-SPACE-IMPACT:
- See Documentation/fs/devpts.txt (included in next patch) for user-
space impact in multi-instance and mixed-mode operation.
TODO:
- Update mount(8), pts(4) man pages. Highlight impact of not
redirecting /dev/ptmx to /dev/pts/ptmx after a multi-instance mount.
Changelog[v6]:
- [Dave Hansen] Use new get_init_pts_sb() interface
- [Serge Hallyn] Don't bother displaying 'newinstance' in show_options
- [Serge Hallyn] Use macros (PARSE_REMOUNT/PARSE_MOUNT) instead of 0/1.
- [Serge Hallyn] Check error return from get_sb_single() (now
get_init_pts_sb())
- devpts_pty_kill(): don't dput error dentries
Changelog[v5]:
- Move get_sb_ref() definition to earlier patch
- Move usage info to Documentation/filesystems/devpts.txt (next patch)
- Make ptmx node even in init_pts_ns, now that default mode is 0000
(defined in earlier patch, enabled here).
- Cache ptmx dentry and use to update mode during remount
(defined in earlier patch, enabled here).
- Bugfix: explicitly ignore newinstance on remount (if newinstance was
specified on remount of initial mount, it would be ignored but
/proc/mounts would imply that the option was set)
Changelog[v4]:
- Update patch description to address H. Peter Anvin's comments
- Consolidate multi-instance mode code under new config token,
CONFIG_DEVPTS_MULTIPLE_INSTANCE.
- Move usage-details from patch description to
Documentation/fs/devpts.txt
Changelog[v3]:
- Rename new mount option to 'newinstance'
- Create ptmx nodes only in 'newinstance' mounts
- Bugfix: parse_mount_options() modifies @data but since we need to
parse the @data twice (once in devpts_get_sb() and once during
do_remount_sb()), parse a local copy of @data in devpts_get_sb().
(restructured code in devpts_get_sb() to fix this)
Changelog[v2]:
- Support both single-mount and multiple-mount semantics and
provide '-onewmnt' option to select the semantics.
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-01-02 14:42:27 +01:00
|
|
|
{
|
2010-07-24 23:48:30 +02:00
|
|
|
return mount_single(fs_type, flags, data, devpts_fill_super);
|
Enable multiple instances of devpts
To support containers, allow multiple instances of devpts filesystem, such
that indices of ptys allocated in one instance are independent of ptys
allocated in other instances of devpts.
But to preserve backward compatibility, enable this support for multiple
instances only if:
- CONFIG_DEVPTS_MULTIPLE_INSTANCES is set to Y, and
- '-o newinstance' mount option is specified while mounting devpts
To use multi-instance mount, a container startup script could:
$ ns_exec -cm /bin/bash
$ umount /dev/pts
$ mount -t devpts -o newinstance lxcpts /dev/pts
$ mount -o bind /dev/pts/ptmx /dev/ptmx
$ /usr/sbin/sshd -p 1234
where 'ns_exec -cm /bin/bash' is calls clone() with CLONE_NEWNS flag and execs
/bin/bash in the child process. A pty created by the sshd is not visible in
the original mount of /dev/pts.
USER-SPACE-IMPACT:
- See Documentation/fs/devpts.txt (included in next patch) for user-
space impact in multi-instance and mixed-mode operation.
TODO:
- Update mount(8), pts(4) man pages. Highlight impact of not
redirecting /dev/ptmx to /dev/pts/ptmx after a multi-instance mount.
Changelog[v6]:
- [Dave Hansen] Use new get_init_pts_sb() interface
- [Serge Hallyn] Don't bother displaying 'newinstance' in show_options
- [Serge Hallyn] Use macros (PARSE_REMOUNT/PARSE_MOUNT) instead of 0/1.
- [Serge Hallyn] Check error return from get_sb_single() (now
get_init_pts_sb())
- devpts_pty_kill(): don't dput error dentries
Changelog[v5]:
- Move get_sb_ref() definition to earlier patch
- Move usage info to Documentation/filesystems/devpts.txt (next patch)
- Make ptmx node even in init_pts_ns, now that default mode is 0000
(defined in earlier patch, enabled here).
- Cache ptmx dentry and use to update mode during remount
(defined in earlier patch, enabled here).
- Bugfix: explicitly ignore newinstance on remount (if newinstance was
specified on remount of initial mount, it would be ignored but
/proc/mounts would imply that the option was set)
Changelog[v4]:
- Update patch description to address H. Peter Anvin's comments
- Consolidate multi-instance mode code under new config token,
CONFIG_DEVPTS_MULTIPLE_INSTANCE.
- Move usage-details from patch description to
Documentation/fs/devpts.txt
Changelog[v3]:
- Rename new mount option to 'newinstance'
- Create ptmx nodes only in 'newinstance' mounts
- Bugfix: parse_mount_options() modifies @data but since we need to
parse the @data twice (once in devpts_get_sb() and once during
do_remount_sb()), parse a local copy of @data in devpts_get_sb().
(restructured code in devpts_get_sb() to fix this)
Changelog[v2]:
- Support both single-mount and multiple-mount semantics and
provide '-onewmnt' option to select the semantics.
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-01-02 14:42:27 +01:00
|
|
|
}
|
|
|
|
#endif
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2009-01-02 14:41:21 +01:00
|
|
|
static void devpts_kill_sb(struct super_block *sb)
|
|
|
|
{
|
|
|
|
struct pts_fs_info *fsi = DEVPTS_SB(sb);
|
|
|
|
|
|
|
|
kfree(fsi);
|
2009-01-02 14:42:02 +01:00
|
|
|
kill_litter_super(sb);
|
2009-01-02 14:41:21 +01:00
|
|
|
}
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
static struct file_system_type devpts_fs_type = {
|
|
|
|
.name = "devpts",
|
2010-07-24 23:48:30 +02:00
|
|
|
.mount = devpts_mount,
|
2009-01-02 14:41:21 +01:00
|
|
|
.kill_sb = devpts_kill_sb,
|
2005-04-17 00:20:36 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The normal naming convention is simply /dev/pts/<number>; this conforms
|
|
|
|
* to the System V naming convention
|
|
|
|
*/
|
|
|
|
|
2008-10-13 11:42:59 +02:00
|
|
|
int devpts_new_index(struct inode *ptmx_inode)
|
2008-04-30 09:54:21 +02:00
|
|
|
{
|
2009-01-02 14:41:21 +01:00
|
|
|
struct super_block *sb = pts_sb_from_inode(ptmx_inode);
|
|
|
|
struct pts_fs_info *fsi = DEVPTS_SB(sb);
|
2008-04-30 09:54:21 +02:00
|
|
|
int index;
|
2008-07-26 09:42:16 +02:00
|
|
|
int ida_ret;
|
2008-04-30 09:54:21 +02:00
|
|
|
|
|
|
|
retry:
|
2009-01-02 14:42:48 +01:00
|
|
|
if (!ida_pre_get(&fsi->allocated_ptys, GFP_KERNEL))
|
2008-04-30 09:54:21 +02:00
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
mutex_lock(&allocated_ptys_lock);
|
2012-01-05 10:06:11 +01:00
|
|
|
if (pty_count >= pty_limit -
|
|
|
|
(fsi->mount_opts.newinstance ? pty_reserve : 0)) {
|
|
|
|
mutex_unlock(&allocated_ptys_lock);
|
|
|
|
return -ENOSPC;
|
|
|
|
}
|
|
|
|
|
2009-01-02 14:41:21 +01:00
|
|
|
ida_ret = ida_get_new(&fsi->allocated_ptys, &index);
|
2008-07-26 09:42:16 +02:00
|
|
|
if (ida_ret < 0) {
|
2008-04-30 09:54:21 +02:00
|
|
|
mutex_unlock(&allocated_ptys_lock);
|
2008-07-26 09:42:16 +02:00
|
|
|
if (ida_ret == -EAGAIN)
|
2008-04-30 09:54:21 +02:00
|
|
|
goto retry;
|
|
|
|
return -EIO;
|
|
|
|
}
|
|
|
|
|
2012-01-05 10:06:11 +01:00
|
|
|
if (index >= fsi->mount_opts.max) {
|
2009-01-02 14:41:21 +01:00
|
|
|
ida_remove(&fsi->allocated_ptys, index);
|
2008-04-30 09:54:21 +02:00
|
|
|
mutex_unlock(&allocated_ptys_lock);
|
2012-01-05 10:06:11 +01:00
|
|
|
return -ENOSPC;
|
2008-04-30 09:54:21 +02:00
|
|
|
}
|
2012-01-05 10:06:02 +01:00
|
|
|
pty_count++;
|
2008-04-30 09:54:21 +02:00
|
|
|
mutex_unlock(&allocated_ptys_lock);
|
|
|
|
return index;
|
|
|
|
}
|
|
|
|
|
2008-10-13 11:42:59 +02:00
|
|
|
void devpts_kill_index(struct inode *ptmx_inode, int idx)
|
2008-04-30 09:54:21 +02:00
|
|
|
{
|
2009-01-02 14:41:21 +01:00
|
|
|
struct super_block *sb = pts_sb_from_inode(ptmx_inode);
|
|
|
|
struct pts_fs_info *fsi = DEVPTS_SB(sb);
|
|
|
|
|
2008-04-30 09:54:21 +02:00
|
|
|
mutex_lock(&allocated_ptys_lock);
|
2009-01-02 14:41:21 +01:00
|
|
|
ida_remove(&fsi->allocated_ptys, idx);
|
2012-01-05 10:06:02 +01:00
|
|
|
pty_count--;
|
2008-04-30 09:54:21 +02:00
|
|
|
mutex_unlock(&allocated_ptys_lock);
|
|
|
|
}
|
|
|
|
|
2008-10-13 11:42:59 +02:00
|
|
|
int devpts_pty_new(struct inode *ptmx_inode, struct tty_struct *tty)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2009-01-02 14:42:48 +01:00
|
|
|
/* tty layer puts index from devpts_new_index() in here */
|
|
|
|
int number = tty->index;
|
2005-04-17 00:20:36 +02:00
|
|
|
struct tty_driver *driver = tty->driver;
|
|
|
|
dev_t device = MKDEV(driver->major, driver->minor_start+number);
|
|
|
|
struct dentry *dentry;
|
2009-01-02 14:41:11 +01:00
|
|
|
struct super_block *sb = pts_sb_from_inode(ptmx_inode);
|
|
|
|
struct inode *inode = new_inode(sb);
|
|
|
|
struct dentry *root = sb->s_root;
|
2009-01-02 14:41:33 +01:00
|
|
|
struct pts_fs_info *fsi = DEVPTS_SB(sb);
|
|
|
|
struct pts_mount_opts *opts = &fsi->mount_opts;
|
2011-02-07 22:14:52 +01:00
|
|
|
int ret = 0;
|
2008-10-13 11:43:18 +02:00
|
|
|
char s[12];
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/* We're supposed to be given the slave end of a pty */
|
|
|
|
BUG_ON(driver->type != TTY_DRIVER_TYPE_PTY);
|
|
|
|
BUG_ON(driver->subtype != PTY_TYPE_SLAVE);
|
|
|
|
|
|
|
|
if (!inode)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2009-01-02 14:44:49 +01:00
|
|
|
inode->i_ino = number + 3;
|
|
|
|
inode->i_uid = opts->setuid ? opts->uid : current_fsuid();
|
|
|
|
inode->i_gid = opts->setgid ? opts->gid : current_fsgid();
|
2005-04-17 00:20:36 +02:00
|
|
|
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
|
2009-01-02 14:41:33 +01:00
|
|
|
init_special_inode(inode, S_IFCHR|opts->mode, device);
|
2006-09-27 10:50:46 +02:00
|
|
|
inode->i_private = tty;
|
2008-10-13 11:43:27 +02:00
|
|
|
tty->driver_data = inode;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2008-10-13 11:43:18 +02:00
|
|
|
sprintf(s, "%d", number);
|
|
|
|
|
2009-01-02 14:41:11 +01:00
|
|
|
mutex_lock(&root->d_inode->i_mutex);
|
2008-10-13 11:43:18 +02:00
|
|
|
|
2009-01-02 14:41:11 +01:00
|
|
|
dentry = d_alloc_name(root, s);
|
2011-03-23 00:35:11 +01:00
|
|
|
if (dentry) {
|
2008-10-13 11:43:18 +02:00
|
|
|
d_add(dentry, inode);
|
2009-01-02 14:41:11 +01:00
|
|
|
fsnotify_create(root->d_inode, dentry);
|
2011-02-07 22:14:52 +01:00
|
|
|
} else {
|
|
|
|
iput(inode);
|
|
|
|
ret = -ENOMEM;
|
2007-05-08 09:24:18 +02:00
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2009-01-02 14:41:11 +01:00
|
|
|
mutex_unlock(&root->d_inode->i_mutex);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2011-02-07 22:14:52 +01:00
|
|
|
return ret;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
2008-10-13 11:42:59 +02:00
|
|
|
struct tty_struct *devpts_get_tty(struct inode *pts_inode, int number)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
devpts_get_tty() should validate inode
devpts_get_tty() assumes that the inode passed in is associated with a valid
pty. But if the only reference to the pty is via a bind-mount, the inode
passed to devpts_get_tty() while valid, would refer to a pty that no longer
exists.
With a lot of debug effort, Grzegorz Nosek developed a small program (see
below) to reproduce a crash on recent kernels. This crash is a regression
introduced by the commit:
commit 527b3e4773628b30d03323a2cb5fb0d84441990f
Author: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Date: Mon Oct 13 10:43:08 2008 +0100
To fix, ensure that the dentry associated with the inode has not yet been
deleted/unhashed by devpts_pty_kill().
See also:
https://lists.linux-foundation.org/pipermail/containers/2009-July/019273.html
tty-bug.c:
#define _GNU_SOURCE
#include <fcntl.h>
#include <sched.h>
#include <stdlib.h>
#include <sys/mount.h>
#include <sys/signal.h>
#include <unistd.h>
#include <stdio.h>
#include <linux/fs.h>
void dummy(int sig)
{
}
static int child(void *unused)
{
int fd;
signal(SIGINT, dummy); signal(SIGHUP, dummy);
pause(); /* cheesy synchronisation to wait for /dev/pts/0 to appear */
mount("/dev/pts/0", "/dev/console", NULL, MS_BIND, NULL);
sleep(2);
fd = open("/dev/console", O_RDWR);
dup(0); dup(0);
write(1, "Hello world!\n", sizeof("Hello world!\n")-1);
return 0;
}
int main(void)
{
pid_t pid;
char *stack;
stack = malloc(16384);
pid = clone(child, stack+16384, CLONE_NEWNS|SIGCHLD, NULL);
open("/dev/ptmx", O_RDWR|O_NOCTTY|O_NONBLOCK);
unlockpt(fd); grantpt(fd);
sleep(2);
kill(pid, SIGHUP);
sleep(1);
return 0; /* exit before child opens /dev/console */
}
Reported-by: Grzegorz Nosek <root@localdomain.pl>
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Tested-by: Serge Hallyn <serue@us.ibm.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-18 03:35:43 +01:00
|
|
|
struct dentry *dentry;
|
|
|
|
struct tty_struct *tty;
|
|
|
|
|
2008-10-13 11:43:08 +02:00
|
|
|
BUG_ON(pts_inode->i_rdev == MKDEV(TTYAUX_MAJOR, PTMX_MINOR));
|
2005-04-17 00:20:36 +02:00
|
|
|
|
devpts_get_tty() should validate inode
devpts_get_tty() assumes that the inode passed in is associated with a valid
pty. But if the only reference to the pty is via a bind-mount, the inode
passed to devpts_get_tty() while valid, would refer to a pty that no longer
exists.
With a lot of debug effort, Grzegorz Nosek developed a small program (see
below) to reproduce a crash on recent kernels. This crash is a regression
introduced by the commit:
commit 527b3e4773628b30d03323a2cb5fb0d84441990f
Author: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Date: Mon Oct 13 10:43:08 2008 +0100
To fix, ensure that the dentry associated with the inode has not yet been
deleted/unhashed by devpts_pty_kill().
See also:
https://lists.linux-foundation.org/pipermail/containers/2009-July/019273.html
tty-bug.c:
#define _GNU_SOURCE
#include <fcntl.h>
#include <sched.h>
#include <stdlib.h>
#include <sys/mount.h>
#include <sys/signal.h>
#include <unistd.h>
#include <stdio.h>
#include <linux/fs.h>
void dummy(int sig)
{
}
static int child(void *unused)
{
int fd;
signal(SIGINT, dummy); signal(SIGHUP, dummy);
pause(); /* cheesy synchronisation to wait for /dev/pts/0 to appear */
mount("/dev/pts/0", "/dev/console", NULL, MS_BIND, NULL);
sleep(2);
fd = open("/dev/console", O_RDWR);
dup(0); dup(0);
write(1, "Hello world!\n", sizeof("Hello world!\n")-1);
return 0;
}
int main(void)
{
pid_t pid;
char *stack;
stack = malloc(16384);
pid = clone(child, stack+16384, CLONE_NEWNS|SIGCHLD, NULL);
open("/dev/ptmx", O_RDWR|O_NOCTTY|O_NONBLOCK);
unlockpt(fd); grantpt(fd);
sleep(2);
kill(pid, SIGHUP);
sleep(1);
return 0; /* exit before child opens /dev/console */
}
Reported-by: Grzegorz Nosek <root@localdomain.pl>
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Tested-by: Serge Hallyn <serue@us.ibm.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-18 03:35:43 +01:00
|
|
|
/* Ensure dentry has not been deleted by devpts_pty_kill() */
|
|
|
|
dentry = d_find_alias(pts_inode);
|
|
|
|
if (!dentry)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
tty = NULL;
|
2008-10-13 11:43:08 +02:00
|
|
|
if (pts_inode->i_sb->s_magic == DEVPTS_SUPER_MAGIC)
|
devpts_get_tty() should validate inode
devpts_get_tty() assumes that the inode passed in is associated with a valid
pty. But if the only reference to the pty is via a bind-mount, the inode
passed to devpts_get_tty() while valid, would refer to a pty that no longer
exists.
With a lot of debug effort, Grzegorz Nosek developed a small program (see
below) to reproduce a crash on recent kernels. This crash is a regression
introduced by the commit:
commit 527b3e4773628b30d03323a2cb5fb0d84441990f
Author: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Date: Mon Oct 13 10:43:08 2008 +0100
To fix, ensure that the dentry associated with the inode has not yet been
deleted/unhashed by devpts_pty_kill().
See also:
https://lists.linux-foundation.org/pipermail/containers/2009-July/019273.html
tty-bug.c:
#define _GNU_SOURCE
#include <fcntl.h>
#include <sched.h>
#include <stdlib.h>
#include <sys/mount.h>
#include <sys/signal.h>
#include <unistd.h>
#include <stdio.h>
#include <linux/fs.h>
void dummy(int sig)
{
}
static int child(void *unused)
{
int fd;
signal(SIGINT, dummy); signal(SIGHUP, dummy);
pause(); /* cheesy synchronisation to wait for /dev/pts/0 to appear */
mount("/dev/pts/0", "/dev/console", NULL, MS_BIND, NULL);
sleep(2);
fd = open("/dev/console", O_RDWR);
dup(0); dup(0);
write(1, "Hello world!\n", sizeof("Hello world!\n")-1);
return 0;
}
int main(void)
{
pid_t pid;
char *stack;
stack = malloc(16384);
pid = clone(child, stack+16384, CLONE_NEWNS|SIGCHLD, NULL);
open("/dev/ptmx", O_RDWR|O_NOCTTY|O_NONBLOCK);
unlockpt(fd); grantpt(fd);
sleep(2);
kill(pid, SIGHUP);
sleep(1);
return 0; /* exit before child opens /dev/console */
}
Reported-by: Grzegorz Nosek <root@localdomain.pl>
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Tested-by: Serge Hallyn <serue@us.ibm.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-18 03:35:43 +01:00
|
|
|
tty = (struct tty_struct *)pts_inode->i_private;
|
|
|
|
|
|
|
|
dput(dentry);
|
|
|
|
|
|
|
|
return tty;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
2008-10-13 11:42:59 +02:00
|
|
|
void devpts_pty_kill(struct tty_struct *tty)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2008-10-13 11:43:27 +02:00
|
|
|
struct inode *inode = tty->driver_data;
|
2009-01-02 14:41:11 +01:00
|
|
|
struct super_block *sb = pts_sb_from_inode(inode);
|
|
|
|
struct dentry *root = sb->s_root;
|
2008-10-13 11:43:27 +02:00
|
|
|
struct dentry *dentry;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2008-10-13 11:43:27 +02:00
|
|
|
BUG_ON(inode->i_rdev == MKDEV(TTYAUX_MAJOR, PTMX_MINOR));
|
|
|
|
|
2009-01-02 14:41:11 +01:00
|
|
|
mutex_lock(&root->d_inode->i_mutex);
|
2008-10-13 11:43:27 +02:00
|
|
|
|
|
|
|
dentry = d_find_alias(inode);
|
|
|
|
|
2011-10-28 14:13:28 +02:00
|
|
|
drop_nlink(inode);
|
2011-02-07 22:14:52 +01:00
|
|
|
d_delete(dentry);
|
|
|
|
dput(dentry); /* d_alloc_name() in devpts_pty_new() */
|
2009-01-02 14:42:48 +01:00
|
|
|
dput(dentry); /* d_find_alias above */
|
2011-02-07 22:14:52 +01:00
|
|
|
|
2009-01-02 14:41:11 +01:00
|
|
|
mutex_unlock(&root->d_inode->i_mutex);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int __init init_devpts_fs(void)
|
|
|
|
{
|
|
|
|
int err = register_filesystem(&devpts_fs_type);
|
2012-01-05 10:06:02 +01:00
|
|
|
struct ctl_table_header *table;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
if (!err) {
|
2012-01-05 10:06:02 +01:00
|
|
|
table = register_sysctl_table(pty_root_table);
|
2005-04-17 00:20:36 +02:00
|
|
|
devpts_mnt = kern_mount(&devpts_fs_type);
|
2009-06-11 15:03:55 +02:00
|
|
|
if (IS_ERR(devpts_mnt)) {
|
2005-04-17 00:20:36 +02:00
|
|
|
err = PTR_ERR(devpts_mnt);
|
2009-06-11 15:03:55 +02:00
|
|
|
unregister_filesystem(&devpts_fs_type);
|
2012-01-05 10:06:02 +01:00
|
|
|
unregister_sysctl_table(table);
|
2009-06-11 15:03:55 +02:00
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
module_init(init_devpts_fs)
|