Commit fcfbd547 authored by Kirill Korotaev's avatar Kirill Korotaev Committed by Linus Torvalds
Browse files

[PATCH] IPC namespace - sysctls



Sysctl tweaks for IPC namespace
Signed-off-by: default avatarPavel Emelianiov <xemul@openvz.org>
Signed-off-by: default avatarKirill Korotaev <dev@openvz.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4e982311
...@@ -92,13 +92,8 @@ extern char modprobe_path[]; ...@@ -92,13 +92,8 @@ extern char modprobe_path[];
extern int sg_big_buff; extern int sg_big_buff;
#endif #endif
#ifdef CONFIG_SYSVIPC #ifdef CONFIG_SYSVIPC
extern size_t shm_ctlmax; static int proc_do_ipc_string(ctl_table *table, int write, struct file *filp,
extern size_t shm_ctlall; void __user *buffer, size_t *lenp, loff_t *ppos);
extern int shm_ctlmni;
extern int msg_ctlmax;
extern int msg_ctlmnb;
extern int msg_ctlmni;
extern int sem_ctls[];
#endif #endif
#ifdef __sparc__ #ifdef __sparc__
...@@ -481,58 +476,58 @@ static ctl_table kern_table[] = { ...@@ -481,58 +476,58 @@ static ctl_table kern_table[] = {
{ {
.ctl_name = KERN_SHMMAX, .ctl_name = KERN_SHMMAX,
.procname = "shmmax", .procname = "shmmax",
.data = &shm_ctlmax, .data = NULL,
.maxlen = sizeof (size_t), .maxlen = sizeof (size_t),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_doulongvec_minmax, .proc_handler = &proc_do_ipc_string,
}, },
{ {
.ctl_name = KERN_SHMALL, .ctl_name = KERN_SHMALL,
.procname = "shmall", .procname = "shmall",
.data = &shm_ctlall, .data = NULL,
.maxlen = sizeof (size_t), .maxlen = sizeof (size_t),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_doulongvec_minmax, .proc_handler = &proc_do_ipc_string,
}, },
{ {
.ctl_name = KERN_SHMMNI, .ctl_name = KERN_SHMMNI,
.procname = "shmmni", .procname = "shmmni",
.data = &shm_ctlmni, .data = NULL,
.maxlen = sizeof (int), .maxlen = sizeof (int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = &proc_do_ipc_string,
}, },
{ {
.ctl_name = KERN_MSGMAX, .ctl_name = KERN_MSGMAX,
.procname = "msgmax", .procname = "msgmax",
.data = &msg_ctlmax, .data = NULL,
.maxlen = sizeof (int), .maxlen = sizeof (int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = &proc_do_ipc_string,
}, },
{ {
.ctl_name = KERN_MSGMNI, .ctl_name = KERN_MSGMNI,
.procname = "msgmni", .procname = "msgmni",
.data = &msg_ctlmni, .data = NULL,
.maxlen = sizeof (int), .maxlen = sizeof (int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = &proc_do_ipc_string,
}, },
{ {
.ctl_name = KERN_MSGMNB, .ctl_name = KERN_MSGMNB,
.procname = "msgmnb", .procname = "msgmnb",
.data = &msg_ctlmnb, .data = NULL,
.maxlen = sizeof (int), .maxlen = sizeof (int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = &proc_do_ipc_string,
}, },
{ {
.ctl_name = KERN_SEM, .ctl_name = KERN_SEM,
.procname = "sem", .procname = "sem",
.data = &sem_ctls, .data = NULL,
.maxlen = 4*sizeof (int), .maxlen = 4*sizeof (int),
.mode = 0644, .mode = 0644,
.proc_handler = &proc_dointvec, .proc_handler = &proc_do_ipc_string,
}, },
#endif #endif
#ifdef CONFIG_MAGIC_SYSRQ #ifdef CONFIG_MAGIC_SYSRQ
...@@ -1832,8 +1827,9 @@ static int do_proc_dointvec_conv(int *negp, unsigned long *lvalp, ...@@ -1832,8 +1827,9 @@ static int do_proc_dointvec_conv(int *negp, unsigned long *lvalp,
return 0; return 0;
} }
static int do_proc_dointvec(ctl_table *table, int write, struct file *filp, static int __do_proc_dointvec(void *tbl_data, ctl_table *table,
void __user *buffer, size_t *lenp, loff_t *ppos, int write, struct file *filp, void __user *buffer,
size_t *lenp, loff_t *ppos,
int (*conv)(int *negp, unsigned long *lvalp, int *valp, int (*conv)(int *negp, unsigned long *lvalp, int *valp,
int write, void *data), int write, void *data),
void *data) void *data)
...@@ -1846,13 +1842,13 @@ static int do_proc_dointvec(ctl_table *table, int write, struct file *filp, ...@@ -1846,13 +1842,13 @@ static int do_proc_dointvec(ctl_table *table, int write, struct file *filp,
char buf[TMPBUFLEN], *p; char buf[TMPBUFLEN], *p;
char __user *s = buffer; char __user *s = buffer;
if (!table->data || !table->maxlen || !*lenp || if (!tbl_data || !table->maxlen || !*lenp ||
(*ppos && !write)) { (*ppos && !write)) {
*lenp = 0; *lenp = 0;
return 0; return 0;
} }
i = (int *) table->data; i = (int *) tbl_data;
vleft = table->maxlen / sizeof(*i); vleft = table->maxlen / sizeof(*i);
left = *lenp; left = *lenp;
...@@ -1941,6 +1937,16 @@ static int do_proc_dointvec(ctl_table *table, int write, struct file *filp, ...@@ -1941,6 +1937,16 @@ static int do_proc_dointvec(ctl_table *table, int write, struct file *filp,
#undef TMPBUFLEN #undef TMPBUFLEN
} }
static int do_proc_dointvec(ctl_table *table, int write, struct file *filp,
void __user *buffer, size_t *lenp, loff_t *ppos,
int (*conv)(int *negp, unsigned long *lvalp, int *valp,
int write, void *data),
void *data)
{
return __do_proc_dointvec(table->data, table, write, filp,
buffer, lenp, ppos, conv, data);
}
/** /**
* proc_dointvec - read a vector of integers * proc_dointvec - read a vector of integers
* @table: the sysctl table * @table: the sysctl table
...@@ -2074,7 +2080,7 @@ int proc_dointvec_minmax(ctl_table *table, int write, struct file *filp, ...@@ -2074,7 +2080,7 @@ int proc_dointvec_minmax(ctl_table *table, int write, struct file *filp,
do_proc_dointvec_minmax_conv, &param); do_proc_dointvec_minmax_conv, &param);
} }
static int do_proc_doulongvec_minmax(ctl_table *table, int write, static int __do_proc_doulongvec_minmax(void *data, ctl_table *table, int write,
struct file *filp, struct file *filp,
void __user *buffer, void __user *buffer,
size_t *lenp, loff_t *ppos, size_t *lenp, loff_t *ppos,
...@@ -2088,13 +2094,13 @@ static int do_proc_doulongvec_minmax(ctl_table *table, int write, ...@@ -2088,13 +2094,13 @@ static int do_proc_doulongvec_minmax(ctl_table *table, int write,
char buf[TMPBUFLEN], *p; char buf[TMPBUFLEN], *p;
char __user *s = buffer; char __user *s = buffer;
if (!table->data || !table->maxlen || !*lenp || if (!data || !table->maxlen || !*lenp ||
(*ppos && !write)) { (*ppos && !write)) {
*lenp = 0; *lenp = 0;
return 0; return 0;
} }
i = (unsigned long *) table->data; i = (unsigned long *) data;
min = (unsigned long *) table->extra1; min = (unsigned long *) table->extra1;
max = (unsigned long *) table->extra2; max = (unsigned long *) table->extra2;
vleft = table->maxlen / sizeof(unsigned long); vleft = table->maxlen / sizeof(unsigned long);
...@@ -2179,6 +2185,17 @@ static int do_proc_doulongvec_minmax(ctl_table *table, int write, ...@@ -2179,6 +2185,17 @@ static int do_proc_doulongvec_minmax(ctl_table *table, int write,
#undef TMPBUFLEN #undef TMPBUFLEN
} }
static int do_proc_doulongvec_minmax(ctl_table *table, int write,
struct file *filp,
void __user *buffer,
size_t *lenp, loff_t *ppos,
unsigned long convmul,
unsigned long convdiv)
{
return __do_proc_doulongvec_minmax(table->data, table, write,
filp, buffer, lenp, ppos, convmul, convdiv);
}
/** /**
* proc_doulongvec_minmax - read a vector of long integers with min/max values * proc_doulongvec_minmax - read a vector of long integers with min/max values
* @table: the sysctl table * @table: the sysctl table
...@@ -2367,6 +2384,49 @@ int proc_dointvec_ms_jiffies(ctl_table *table, int write, struct file *filp, ...@@ -2367,6 +2384,49 @@ int proc_dointvec_ms_jiffies(ctl_table *table, int write, struct file *filp,
do_proc_dointvec_ms_jiffies_conv, NULL); do_proc_dointvec_ms_jiffies_conv, NULL);
} }
#ifdef CONFIG_SYSVIPC
static int proc_do_ipc_string(ctl_table *table, int write, struct file *filp,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
void *data;
struct ipc_namespace *ns;
ns = current->nsproxy->ipc_ns;
switch (table->ctl_name) {
case KERN_SHMMAX:
data = &ns->shm_ctlmax;
goto proc_minmax;
case KERN_SHMALL:
data = &ns->shm_ctlall;
goto proc_minmax;
case KERN_SHMMNI:
data = &ns->shm_ctlmni;
break;
case KERN_MSGMAX:
data = &ns->msg_ctlmax;
break;
case KERN_MSGMNI:
data = &ns->msg_ctlmni;
break;
case KERN_MSGMNB:
data = &ns->msg_ctlmnb;
break;
case KERN_SEM:
data = &ns->sem_ctls;
break;
default:
return -EINVAL;
}
return __do_proc_dointvec(data, table, write, filp, buffer,
lenp, ppos, NULL, NULL);
proc_minmax:
return __do_proc_doulongvec_minmax(data, table, write, filp, buffer,
lenp, ppos, 1l, 1l);
}
#endif
#else /* CONFIG_PROC_FS */ #else /* CONFIG_PROC_FS */
int proc_dostring(ctl_table *table, int write, struct file *filp, int proc_dostring(ctl_table *table, int write, struct file *filp,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment