mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-06 10:00:17 +00:00
ipmi: Fix kernel panic at ipmi_ssif_thread()
commit 6de65fcfdb 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>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
8f0fde5bc9
commit
d517be5133
@@ -891,6 +891,7 @@ static void msg_written_handler(struct ssif_info *ssif_info, int result,
|
|||||||
* for details on the intricacies of this.
|
* for details on the intricacies of this.
|
||||||
*/
|
*/
|
||||||
int left;
|
int left;
|
||||||
|
unsigned char *data_to_send;
|
||||||
|
|
||||||
ssif_inc_stat(ssif_info, sent_messages_parts);
|
ssif_inc_stat(ssif_info, sent_messages_parts);
|
||||||
|
|
||||||
@@ -899,6 +900,7 @@ static void msg_written_handler(struct ssif_info *ssif_info, int result,
|
|||||||
left = 32;
|
left = 32;
|
||||||
/* Length byte. */
|
/* Length byte. */
|
||||||
ssif_info->multi_data[ssif_info->multi_pos] = left;
|
ssif_info->multi_data[ssif_info->multi_pos] = left;
|
||||||
|
data_to_send = ssif_info->multi_data + ssif_info->multi_pos;
|
||||||
ssif_info->multi_pos += left;
|
ssif_info->multi_pos += left;
|
||||||
if (left < 32)
|
if (left < 32)
|
||||||
/*
|
/*
|
||||||
@@ -912,7 +914,7 @@ static void msg_written_handler(struct ssif_info *ssif_info, int result,
|
|||||||
rv = ssif_i2c_send(ssif_info, msg_written_handler,
|
rv = ssif_i2c_send(ssif_info, msg_written_handler,
|
||||||
I2C_SMBUS_WRITE,
|
I2C_SMBUS_WRITE,
|
||||||
SSIF_IPMI_MULTI_PART_REQUEST_MIDDLE,
|
SSIF_IPMI_MULTI_PART_REQUEST_MIDDLE,
|
||||||
ssif_info->multi_data + ssif_info->multi_pos,
|
data_to_send,
|
||||||
I2C_SMBUS_BLOCK_DATA);
|
I2C_SMBUS_BLOCK_DATA);
|
||||||
if (rv < 0) {
|
if (rv < 0) {
|
||||||
/* request failed, just return the error. */
|
/* request failed, just return the error. */
|
||||||
|
|||||||
Reference in New Issue
Block a user