Commit 75c486cb authored by Corey Minyard's avatar Corey Minyard
Browse files

ipmi:ssif: Clean up kthread on errors 



If an error occurs after the ssif kthread is created, but before the
main IPMI code starts the ssif interface, the ssif kthread will not
be stopped.

So make sure the kthread is stopped on an error condition if it is
running.

Fixes: 25930707 ("ipmi: Add SMBus interface driver (SSIF)")
Reported-by: default avatarLi Xiao <&lt;252270051@hdu.edu.cn>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarLi Xiao <252270051@hdu.edu.cn>
Signed-off-by: default avatarCorey Minyard <corey@minyard.net>
parent 91eb7ec7

drivers/char/ipmi/ipmi_ssif.c

+12 −1
Original line number Diff line number Diff line
@@ -1268,8 +1268,10 @@ static void shutdown_ssif(void *send_info) 
	ssif_info->stopping = true;

	timer_delete_sync(&ssif_info->watch_timer);

	timer_delete_sync(&ssif_info->retry_timer);

	if (ssif_info->thread)

	if (ssif_info->thread) {

		kthread_stop(ssif_info->thread);

		ssif_info->thread = NULL;

	}

}



static void ssif_remove(struct i2c_client *client)
@@ -1912,6 +1914,15 @@ static int ssif_probe(struct i2c_client *client) 


 out:

	if (rv) {

		/*

		 * If ipmi_register_smi() starts the interface, it will

		 * call shutdown and that will free the thread and set

		 * it to NULL.  Otherwise it must be freed here.

		 */

		if (ssif_info->thread) {

			kthread_stop(ssif_info->thread);

			ssif_info->thread = NULL;

		}

		if (addr_info)

			addr_info->client = NULL;