Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-01-23 02:14:37 +00:00
Code Issues Projects Releases Wiki Activity

usernsd: move MAX_MSG_SIZE to namespaces.h

Browse source 
We'll use this size in the next patch to avoid having to do some dynamic
allocation.

v2: call it MAX_UNSFD_MSG_SIZE instead
v3: fix all uses of MAX_MSG_SIZE :)

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Tycho Andersen 2015-09-16 21:02:36 -06:00 • committed by Pavel Emelyanov
parent 459fb8b7da
commit 72ff44d0dc
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/namespaces.h
View file

@ -95,6 +95,8 @@ typedef int (*uns_call_t)(void *arg, int fd);
*/
#define UNS_FDOUT 0x2
#define MAX_UNSFD_MSG_SIZE 256
/*
* When we're restoring inside user namespace, some things are
* not allowed to be done there due to insufficient capabilities.

6
namespaces.c
View file

@ -849,8 +849,6 @@ struct unsc_msg {
char c[CMSG_SPACE(sizeof(int))];
};
#define MAX_MSG_SIZE 256
static int usernsd_pid;
static inline void unsc_msg_init(struct unsc_msg *m, uns_call_t *c,
@ -910,7 +908,7 @@ static int usernsd(int sk)
while (1) {
struct unsc_msg um;
static char msg[MAX_MSG_SIZE];
static char msg[MAX_UNSFD_MSG_SIZE];
uns_call_t call;
int flags, fd, ret;
@ -977,7 +975,7 @@ int userns_call(uns_call_t call, int flags,
bool async = flags & UNS_ASYNC;
struct unsc_msg um;
if (unlikely(arg_size > MAX_MSG_SIZE)) {
if (unlikely(arg_size > MAX_UNSFD_MSG_SIZE)) {
pr_err("UNS: message size exceeded\n");
return -1;
}