Commit 84580133 authored by Corey Minyard's avatar Corey Minyard Committed by Zheng Zengkai
Browse files

ipmi:watchdog: Set panic count to proper value on a panic 

mainline inclusion
from v5.16-rc1
commit db05ddf7
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5DVR9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=db05ddf7f321634c5659a0cf7ea56594e22365f7



--------------------------------

You will get two decrements when the messages on a panic are sent, not
one, since commit 2033f685 ("ipmi: Free receive messages when in an
oops") was added, but the watchdog code had a bug where it didn't set
the value properly.

Reported-by: default avatarAnton Lundin <glance@acc.umu.se>
Cc: <Stable@vger.kernel.org> # v5.4+
Fixes: 2033f685 ("ipmi: Free receive messages when in an oops")
Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
Signed-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Reviewed-by: default avatarLi JinLin <lijinlin3@huawei.com>
Acked-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 6ea9a76f

drivers/char/ipmi/ipmi_watchdog.c

+4 −4
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ static void panic_halt_ipmi_heartbeat(void) 
	msg.cmd = IPMI_WDOG_RESET_TIMER;

	msg.data = NULL;

	msg.data_len = 0;

	atomic_inc(&panic_done_count);

	atomic_add(2, &panic_done_count);

	rv = ipmi_request_supply_msgs(watchdog_user,

				      (struct ipmi_addr *) &addr,

				      0,
@@ -513,7 +513,7 @@ static void panic_halt_ipmi_heartbeat(void) 
				      &panic_halt_heartbeat_recv_msg,

				      1);

	if (rv)

		atomic_dec(&panic_done_count);

		atomic_sub(2, &panic_done_count);

}



static struct ipmi_smi_msg panic_halt_smi_msg = {
@@ -537,12 +537,12 @@ static void panic_halt_ipmi_set_timeout(void) 
	/* Wait for the messages to be free. */

	while (atomic_read(&panic_done_count) != 0)

		ipmi_poll_interface(watchdog_user);

	atomic_inc(&panic_done_count);

	atomic_add(2, &panic_done_count);

	rv = __ipmi_set_timeout(&panic_halt_smi_msg,

				&panic_halt_recv_msg,

				&send_heartbeat_now);

	if (rv) {

		atomic_dec(&panic_done_count);

		atomic_sub(2, &panic_done_count);

		pr_warn("Unable to extend the watchdog timeout\n");

	} else {

		if (send_heartbeat_now)