Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2722def0 authored by Corey Minyard's avatar Corey Minyard Committed by Greg Kroah-Hartman
Browse files

ipmi: fix unsigned long underflow 



commit 392a17b10ec4320d3c0e96e2a23ebaad1123b989 upstream.

When I set the timeout to a specific value such as 500ms, the timeout
event will not happen in time due to the overflow in function
check_msg_timeout:
...
	ent->timeout -= timeout_period;
	if (ent->timeout > 0)
		return;
...

The type of timeout_period is long, but ent->timeout is unsigned long.
This patch makes the type consistent.

Reported-by: default avatarWeilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
Tested-by: default avatarWeilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f72e2ba1

drivers/char/ipmi/ipmi_msghandler.c

+6 −4
Original line number Diff line number Diff line
@@ -4010,7 +4010,8 @@ smi_from_recv_msg(ipmi_smi_t intf, struct ipmi_recv_msg *recv_msg, 
}



static void check_msg_timeout(ipmi_smi_t intf, struct seq_table *ent,

			      struct list_head *timeouts, long timeout_period,

			      struct list_head *timeouts,

			      unsigned long timeout_period,

			      int slot, unsigned long *flags,

			      unsigned int *waiting_msgs)

{
@@ -4023,8 +4024,8 @@ static void check_msg_timeout(ipmi_smi_t intf, struct seq_table *ent, 
	if (!ent->inuse)

		return;



	if (timeout_period < ent->timeout) {

		ent->timeout -= timeout_period;

	if (ent->timeout > 0) {

		(*waiting_msgs)++;

		return;

	}
@@ -4091,7 +4092,8 @@ static void check_msg_timeout(ipmi_smi_t intf, struct seq_table *ent, 
	}

}



static unsigned int ipmi_timeout_handler(ipmi_smi_t intf, long timeout_period)

static unsigned int ipmi_timeout_handler(ipmi_smi_t intf,

					 unsigned long timeout_period)

{

	struct list_head     timeouts;

	struct ipmi_recv_msg *msg, *msg2;