Skip to content

Commit 07245f1

Browse files
Svenning Soerensengregkh
Svenning Soerensen
authored andcommitted
IPC: bugfix for msgrcv with msgtyp < 0
commit 368ae53 upstream. According to 'man msgrcv': "If msgtyp is less than 0, the first message of the lowest type that is less than or equal to the absolute value of msgtyp shall be received." Bug: The kernel only returns a message if its type is 1; other messages with type < abs(msgtype) will never get returned. Fix: After having traversed the list to find the first message with the lowest type, we need to actually return that message. This regression was introduced by commit daaf74c ("ipc: refactor msg list search into separate function") Signed-off-by: Svenning Soerensen <[email protected]> Reviewed-by: Peter Hurley <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent b3772c8 commit 07245f1

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

ipc/msg.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ static inline void free_copy(struct msg_msg *copy)
795795

796796
static struct msg_msg *find_msg(struct msg_queue *msq, long *msgtyp, int mode)
797797
{
798-
struct msg_msg *msg;
798+
struct msg_msg *msg, *found = NULL;
799799
long count = 0;
800800

801801
list_for_each_entry(msg, &msq->q_messages, m_list) {
@@ -804,6 +804,7 @@ static struct msg_msg *find_msg(struct msg_queue *msq, long *msgtyp, int mode)
804804
*msgtyp, mode)) {
805805
if (mode == SEARCH_LESSEQUAL && msg->m_type != 1) {
806806
*msgtyp = msg->m_type - 1;
807+
found = msg;
807808
} else if (mode == SEARCH_NUMBER) {
808809
if (*msgtyp == count)
809810
return msg;
@@ -813,7 +814,7 @@ static struct msg_msg *find_msg(struct msg_queue *msq, long *msgtyp, int mode)
813814
}
814815
}
815816

816-
return ERR_PTR(-EAGAIN);
817+
return found ?: ERR_PTR(-EAGAIN);
817818
}
818819

819820

0 commit comments

Comments
 (0)