adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] devpts: use lib/parser.c for parsing mount options

Browse source 
Item from "2.6 should fix" list.

Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Domen Puncer 2006-03-23 03:00:59 -08:00 committed by Linus Torvalds
parent ee25e96fcd
commit 7a673c6b8f
1 changed files with 48 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
fs/devpts/inode.c
View file

@ -18,6 +18,7 @@
#include <linux/mount.h> #include <linux/mount.h>
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/devpts_fs.h> #include <linux/devpts_fs.h>
#include <linux/parser.h>
#define DEVPTS_SUPER_MAGIC 0x1cd1 #define DEVPTS_SUPER_MAGIC 0x1cd1
@ -32,39 +33,60 @@ static struct {
umode_t mode; umode_t mode;
} config = {.mode = 0600}; } config = {.mode = 0600};
enum {
Opt_uid, Opt_gid, Opt_mode,
Opt_err
};
static match_table_t tokens = {
{Opt_uid, "uid=%u"},
{Opt_gid, "gid=%u"},
{Opt_mode, "mode=%o"},
{Opt_err, NULL}
};
static int devpts_remount(struct super_block *sb, int *flags, char *data) static int devpts_remount(struct super_block *sb, int *flags, char *data)
{ {
int setuid = 0; char *p;
int setgid = 0;
uid_t uid = 0;
gid_t gid = 0;
umode_t mode = 0600;
char *this_char;
this_char = NULL; config.setuid = 0;
while ((this_char = strsep(&data, ",")) != NULL) { config.setgid = 0;
int n; config.uid = 0;
char dummy; config.gid = 0;
if (!*this_char) config.mode = 0600;
while ((p = strsep(&data, ",")) != NULL) {
substring_t args[MAX_OPT_ARGS];
int token;
int option;
if (!*p)
continue; continue;
if (sscanf(this_char, "uid=%i%c", &n, &dummy) == 1) {
setuid = 1; token = match_token(p, tokens, args);
uid = n; switch (token) {
} else if (sscanf(this_char, "gid=%i%c", &n, &dummy) == 1) { case Opt_uid:
setgid = 1; if (match_int(&args[0], &option))
gid = n; return -EINVAL;
} else if (sscanf(this_char, "mode=%o%c", &n, &dummy) == 1) config.uid = option;
mode = n & ~S_IFMT; config.setuid = 1;
else { break;
printk("devpts: called with bogus options\n"); case Opt_gid:
if (match_int(&args[0], &option))
return -EINVAL;
config.gid = option;
config.setgid = 1;
break;
case Opt_mode:
if (match_octal(&args[0], &option))
return -EINVAL;
config.mode = option & ~S_IFMT;
break;
default:
printk(KERN_ERR "devpts: called with bogus options\n");
return -EINVAL; return -EINVAL;
} }
} }
config.setuid = setuid;
config.setgid = setgid;
config.uid = uid;
config.gid = gid;
config.mode = mode;
return 0; return 0;
} }