From 72ff44d0dc9a4e7ecf018a622dc247946eabb50d Mon Sep 17 00:00:00 2001 From: Tycho Andersen Date: Wed, 16 Sep 2015 21:02:36 -0600 Subject: [PATCH] usernsd: move MAX_MSG_SIZE to namespaces.h 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 Signed-off-by: Pavel Emelyanov --- include/namespaces.h | 2 ++ namespaces.c | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/namespaces.h b/include/namespaces.h index 52d2f34f5..18557af7c 100644 --- a/include/namespaces.h +++ b/include/namespaces.h @@ -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. diff --git a/namespaces.c b/namespaces.c index 9ce4783d7..76e05ce98 100644 --- a/namespaces.c +++ b/namespaces.c @@ -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; }