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

Commit 9ff00d0b authored by Corey Minyard's avatar Corey Minyard Committed by Greg Kroah-Hartman
Browse files

ipmi: Disable some operations during a panic 



[ Upstream commit b36eb5e7b75a756baa64909a176dd4269ee05a8b ]

Don't do kfree or other risky things when oops_in_progress is set.
It's easy enough to avoid doing them

Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 4bba26f8

drivers/char/ipmi/ipmi_msghandler.c

+7 −3
Original line number Diff line number Diff line
@@ -4797,6 +4797,8 @@ static atomic_t recv_msg_inuse_count = ATOMIC_INIT(0); 
static void free_smi_msg(struct ipmi_smi_msg *msg)

{

	atomic_dec(&smi_msg_inuse_count);

	/* Try to keep as much stuff out of the panic path as possible. */

	if (!oops_in_progress)

		kfree(msg);

}
@@ -4816,6 +4818,8 @@ EXPORT_SYMBOL(ipmi_alloc_smi_msg); 
static void free_recv_msg(struct ipmi_recv_msg *msg)

{

	atomic_dec(&recv_msg_inuse_count);

	/* Try to keep as much stuff out of the panic path as possible. */

	if (!oops_in_progress)

		kfree(msg);

}
@@ -4834,7 +4838,7 @@ static struct ipmi_recv_msg *ipmi_alloc_recv_msg(void) 


void ipmi_free_recv_msg(struct ipmi_recv_msg *msg)

{

	if (msg->user)

	if (msg->user && !oops_in_progress)

		kref_put(&msg->user->refcount, free_user);

	msg->done(msg);

}

drivers/char/ipmi/ipmi_watchdog.c

+12 −5
Original line number Diff line number Diff line
@@ -337,14 +337,18 @@ static atomic_t msg_tofree = ATOMIC_INIT(0); 
static DECLARE_COMPLETION(msg_wait);

static void msg_free_smi(struct ipmi_smi_msg *msg)

{

	if (atomic_dec_and_test(&msg_tofree))

	if (atomic_dec_and_test(&msg_tofree)) {

		if (!oops_in_progress)

			complete(&msg_wait);

	}

}

static void msg_free_recv(struct ipmi_recv_msg *msg)

{

	if (atomic_dec_and_test(&msg_tofree))

	if (atomic_dec_and_test(&msg_tofree)) {

		if (!oops_in_progress)

			complete(&msg_wait);

	}

}

static struct ipmi_smi_msg smi_msg = {

	.done = msg_free_smi

};
@@ -429,8 +433,10 @@ static int _ipmi_set_timeout(int do_heartbeat) 
	rv = __ipmi_set_timeout(&smi_msg,

				&recv_msg,

				&send_heartbeat_now);

	if (rv)

	if (rv) {

		atomic_set(&msg_tofree, 0);

		return rv;

	}



	wait_for_completion(&msg_wait);
@@ -575,6 +581,7 @@ static int __ipmi_heartbeat(void) 
				      &recv_msg,

				      1);

	if (rv) {

		atomic_set(&msg_tofree, 0);

		pr_warn("heartbeat send failure: %d\n", rv);

		return rv;

	}