Signed-off-by: Peter Hurley <pe...@hurleysoftware.com>
---
ipc/msg.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/ipc/msg.c b/ipc/msg.c
index 418c5a5..c3867da 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -837,7 +837,7 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz,
long msgtyp,
for (;;) {
struct msg_receiver msr_d;
- struct list_head *tmp;
+ struct msg_msg *walk_msg;
long msg_counter = 0;
msg = ERR_PTR(-EACCES);
@@ -845,11 +845,8 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz,
long msgtyp,
goto out_unlock;
msg = ERR_PTR(-EAGAIN);
- tmp = msq->q_messages.next;
- while (tmp != &msq->q_messages) {
- struct msg_msg *walk_msg;
+ list_for_each_entry(walk_msg, &msq->qmessages, m_list) {
- walk_msg = list_entry(tmp, struct msg_msg, m_list);
if (testmsg(walk_msg, msgtyp, mode) &&
!security_msg_queue_msgrcv(msq, walk_msg, current,
msgtyp, mode)) {
@@ -865,7 +862,6 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz,
long msgtyp,
break;
msg_counter++;
}
- tmp = tmp->next;
}
if (!IS_ERR(msg)) {
/*
--
1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
