From 1ddca6c2ee9d422f309650044c826bcb3e6bf65f Mon Sep 17 00:00:00 2001 From: Stanislav Kinsbursky Date: Fri, 4 Jan 2013 15:34:58 -0800 Subject: [PATCH] --- yaml --- r: 348271 b: refs/heads/master c: 85398aa8de1d68f44ff1b5d0ed9ceb2b0c51ce49 h: refs/heads/master i: 348269: 05800bc8c76e6624dbfedbc81fc3de7a6ad07b22 348267: 731315e87c4e97ebb1b182bccfc4d459d0ccb774 348263: a92b0d686426fa7ca002b2d785f802fda798e185 348255: 6075f662f3e95dec79bb97ae10a4b30560026999 v: v3 --- [refs] | 2 +- trunk/ipc/msg.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index bdc5ca314c9a..0978772135a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a665531a3b7c2ad2c87903b24646be6916340e4 +refs/heads/master: 85398aa8de1d68f44ff1b5d0ed9ceb2b0c51ce49 diff --git a/trunk/ipc/msg.c b/trunk/ipc/msg.c index d20ffc7d3f24..7a20536c3a50 100644 --- a/trunk/ipc/msg.c +++ b/trunk/ipc/msg.c @@ -797,15 +797,17 @@ static inline struct msg_msg *prepare_copy(void __user *buf, size_t bufsz, return copy; } -static inline void free_copy(int msgflg, struct msg_msg *copy) +static inline void free_copy(struct msg_msg *copy) { - if (msgflg & MSG_COPY) + if (copy) free_msg(copy); } #else -#define free_copy(msgflg, copy) do {} while (0) #define prepare_copy(buf, sz, msgflg, msgtyp, copy_nr) ERR_PTR(-ENOSYS) #define fill_copy(copy_nr, msg_nr, msg, copy) NULL +static inline void free_copy(struct msg_msg *copy) +{ +} #endif long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, @@ -816,7 +818,7 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, struct msg_msg *msg; int mode; struct ipc_namespace *ns; - struct msg_msg *copy; + struct msg_msg *copy = NULL; unsigned long __maybe_unused copy_number; if (msqid < 0 || (long) bufsz < 0) @@ -831,7 +833,7 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, msq = msg_lock_check(ns, msqid); if (IS_ERR(msq)) { - free_copy(msgflg, copy); + free_copy(copy); return PTR_ERR(msq); } @@ -965,7 +967,7 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, } } if (IS_ERR(msg)) { - free_copy(msgflg, copy); + free_copy(copy); return PTR_ERR(msg); }