Skip to content

Commit 35df208

Browse files
Joeseph Changgregkh
authored andcommitted
ipmi: Fix kernel panic at ipmi_ssif_thread()
commit 6de65fcfdb51835789b245203d1bfc8d14cb1e06 upstream. msg_written_handler() may set ssif_info->multi_data to NULL when using ipmitool to write fru. Before setting ssif_info->multi_data to NULL, add new local pointer "data_to_send" and store correct i2c data pointer to it to fix NULL pointer kernel panic and incorrect ssif_info->multi_pos. Signed-off-by: Joeseph Chang <joechang@codeaurora.org> Signed-off-by: Corey Minyard <cminyard@mvista.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent d439226 commit 35df208

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

drivers/char/ipmi/ipmi_ssif.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -888,6 +888,7 @@ static void msg_written_handler(struct ssif_info *ssif_info, int result,
888888
* for details on the intricacies of this.
889889
*/
890890
int left;
891+
unsigned char *data_to_send;
891892

892893
ssif_inc_stat(ssif_info, sent_messages_parts);
893894

@@ -896,6 +897,7 @@ static void msg_written_handler(struct ssif_info *ssif_info, int result,
896897
left = 32;
897898
/* Length byte. */
898899
ssif_info->multi_data[ssif_info->multi_pos] = left;
900+
data_to_send = ssif_info->multi_data + ssif_info->multi_pos;
899901
ssif_info->multi_pos += left;
900902
if (left < 32)
901903
/*
@@ -909,7 +911,7 @@ static void msg_written_handler(struct ssif_info *ssif_info, int result,
909911
rv = ssif_i2c_send(ssif_info, msg_written_handler,
910912
I2C_SMBUS_WRITE,
911913
SSIF_IPMI_MULTI_PART_REQUEST_MIDDLE,
912-
ssif_info->multi_data + ssif_info->multi_pos,
914+
data_to_send,
913915
I2C_SMBUS_BLOCK_DATA);
914916
if (rv < 0) {
915917
/* request failed, just return the error. */

0 commit comments

Comments
 (0)