Skip to contentSkip to conversation

devpts: fix to set default values of mount options

PATCH Superseded Wei Yongjun 2 participants 4 messages May 15, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 devpts: fix to set default values of mount options

If devpts is mounted with no option specified, the default values of mount options will no be set. This happend in my Fedora11Beta box when CONFIG_DEVPTS_MULTIPLE_INSTANCES is configured in .config.

  $ mkdir /dev/pts2
  $ mount -t devpts devpts /dev/pts2
  $ cat /proc/mounts
  devpts /dev/pts2 devpts rw,relatime,mode=000,ptmxmode=000 0 0
  # umount /dev/pts2
  $ mount -t devpts -o gid=0 devpts /dev/pts2
  $ cat /proc/mounts
  devpts /dev/pts2 devpts rw,relatime,gid=0,mode=600,ptmxmode=000 0 0

This patch fixed the problem.

---
 fs/devpts/inode.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
fs/devpts/inode.c +6 -4
index 21165cf..738ffdc 100644
@@ -105,6 +105,9 @@ static int parse_mount_options(char *data, int op, struct pts_mount_opts *opts)
 	if (op == PARSE_MOUNT)
 		opts->newinstance = 0;
 
+	if (!data)
+		return 0;
+
 	while ((p = strsep(&data, ",")) != NULL) {
 		substring_t args[MAX_OPT_ARGS];
 		int token;
@@ -356,11 +359,10 @@ static int devpts_get_sb(struct file_system_type *fs_type,
 	struct super_block *s;
 
 	memset(&opts, 0, sizeof(opts));
-	if (data) {
-		error = parse_mount_options(data, PARSE_MOUNT, &opts);
-		if (error)
+
+	error = parse_mount_options(data, PARSE_MOUNT, &opts);
+	if (error)
 			return error;
-	}
 
 	if (opts.newinstance)
 		s = sget(fs_type, NULL, set_anon_super, NULL);
Signature · 1 line
1.5.3.8
#1 lore raw

PATCH v2 1/1 devpts: fix to set default values of mount options

If devpts is mounted with no option specified, the default values of mount options will no be set. This happend in my Fedora11Beta box.

  $ mkdir /dev/pts2
  $ mount -t devpts devpts /dev/pts2
  $ cat /proc/mounts
  devpts /dev/pts2 devpts rw,relatime,mode=000,ptmxmode=000 0 0
  # umount /dev/pts2
  $ mount -t devpts -o gid=0 devpts /dev/pts2
  $ cat /proc/mounts
  devpts /dev/pts2 devpts rw,relatime,gid=0,mode=600,ptmxmode=000 0 0

This patch fixed this problem.

---
 fs/devpts/inode.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
fs/devpts/inode.c +7 -5
index 21165cf..13392b5 100644
@@ -105,6 +105,9 @@ static int parse_mount_options(char *data, int op, struct pts_mount_opts *opts)
 	if (op == PARSE_MOUNT)
 		opts->newinstance = 0;
 
+	if (!data)
+		return 0;
+
 	while ((p = strsep(&data, ",")) != NULL) {
 		substring_t args[MAX_OPT_ARGS];
 		int token;
@@ -356,11 +359,10 @@ static int devpts_get_sb(struct file_system_type *fs_type,
 	struct super_block *s;
 
 	memset(&opts, 0, sizeof(opts));
-	if (data) {
-		error = parse_mount_options(data, PARSE_MOUNT, &opts);
-		if (error)
-			return error;
-	}
+
+	error = parse_mount_options(data, PARSE_MOUNT, &opts);
+	if (error)
+		return error;
 
 	if (opts.newinstance)
 		s = sget(fs_type, NULL, set_anon_super, NULL);
Signature · 1 line
1.5.3.8
#2 lore raw

PATCH 1/1 devpts: change the default value of devpts mode to 0620

The value of devpts mode is usually set to 620 in file /etc/fstab like this:

$grep devpts /etc/fstab
devpts /dev/pts devpts gid=5,mode=620 0 0

But the default mode value of devpts is 0600. Why not set it to 0620? This patch change it 0620.

---
fs/devpts/inode.c | 2 +-

1 files changed, 1 insertions(+), 1 deletions(-)
fs/devpts/inode.c +0 -0
index 13392b5..33430b9 100644
@@ -26,7 +26,7 @@
 

#define DEVPTS_SUPER_MAGIC 0x1cd1

-#define DEVPTS_DEFAULT_MODE 0600
+#define DEVPTS_DEFAULT_MODE 0620
/*
* 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

Signature · 1 line
1.5.3.8
#3 lore raw

Re: [PATCH] devpts: change the default value of devpts mode to 0620

Quoted 8 lines · On Fri, 15 May 2009 16:13:44 +0800 Wei Yongjun <[email protected]> wrote:

The value of devpts mode is usually set to 620 in file /etc/fstab like this:

$grep devpts /etc/fstab
devpts /dev/pts devpts gid=5,mode=620 0 0

But the default mode value of devpts is 0600. Why not set it to 0620? This patch change it 0620.

NAK

The default is effectively ABI so you are changing it for people using the 0600 default and doing nothing at all useful for those with 0620 defaults in their mount tab (which btw is distro dependant policy)