Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 348274
b: refs/heads/master
c: 3fcfe78
h: refs/heads/master
v: v3
  • Loading branch information
Stanislav Kinsbursky authored and Linus Torvalds committed Jan 5, 2013
1 parent 24e2a1a commit 2aeda3c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 51eeacaa07d1372a7bc9612548ffe6cd846f4f2f
refs/heads/master: 3fcfe78658695b424314ddb76abc8d58b4fc98e6
8 changes: 8 additions & 0 deletions trunk/ipc/msg.c
Original file line number Diff line number Diff line change
Expand Up @@ -770,6 +770,10 @@ static long do_msg_fill(void __user *dest, struct msg_msg *msg, size_t bufsz)
}

#ifdef CONFIG_CHECKPOINT_RESTORE
/*
* This function creates new kernel message structure, large enough to store
* bufsz message bytes.
*/
static inline struct msg_msg *prepare_copy(void __user *buf, size_t bufsz,
int msgflg, long *msgtyp,
unsigned long *copy_number)
Expand Down Expand Up @@ -881,6 +885,10 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp,
msg = ERR_PTR(-E2BIG);
goto out_unlock;
}
/*
* If we are copying, then do not unlink message and do
* not update queue parameters.
*/
if (msgflg & MSG_COPY)
goto out_unlock;
list_del(&msg->m_list);
Expand Down

0 comments on commit 2aeda3c

Please sign in to comment.