Commit 7602b957 authored by Corey Minyard's avatar Corey Minyard
Browse files

ipmi:ssif: Check for NULL msg when handling events and messages 



Even though it's not possible to get into the SSIF_GETTING_MESSAGES and
SSIF_GETTING_EVENTS states without a valid message in the msg field,
it's probably best to be defensive here and check and print a log, since
that means something else went wrong.

Also add a default clause to that switch statement to release the lock
and print a log, in case the state variable gets messed up somehow.

Reported-by: default avatarHaowen Bai <baihaowen@meizu.com>
Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
parent 0924c5a0

drivers/char/ipmi/ipmi_ssif.c

+23 −0
Original line number Diff line number Diff line
@@ -814,6 +814,14 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, 
		break;



	case SSIF_GETTING_EVENTS:

		if (!msg) {

			/* Should never happen, but just in case. */

			dev_warn(&ssif_info->client->dev,

				 "No message set while getting events\n");

			ipmi_ssif_unlock_cond(ssif_info, flags);

			break;

		}



		if ((result < 0) || (len < 3) || (msg->rsp[2] != 0)) {

			/* Error getting event, probably done. */

			msg->done(msg);
@@ -838,6 +846,14 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, 
		break;



	case SSIF_GETTING_MESSAGES:

		if (!msg) {

			/* Should never happen, but just in case. */

			dev_warn(&ssif_info->client->dev,

				 "No message set while getting messages\n");

			ipmi_ssif_unlock_cond(ssif_info, flags);

			break;

		}



		if ((result < 0) || (len < 3) || (msg->rsp[2] != 0)) {

			/* Error getting event, probably done. */

			msg->done(msg);
@@ -861,6 +877,13 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, 
			deliver_recv_msg(ssif_info, msg);

		}

		break;



	default:

		/* Should never happen, but just in case. */

		dev_warn(&ssif_info->client->dev,

			 "Invalid state in message done handling: %d\n",

			 ssif_info->ssif_state);

		ipmi_ssif_unlock_cond(ssif_info, flags);

	}



	flags = ipmi_ssif_lock_cond(ssif_info, &oflags);