diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-16 20:49:51 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-16 20:49:51 (GMT) |
| commit | e2a978ec72cffe4739f5ef7618961d6a6209fa66 (patch) | |
| tree | ac6c13dc0132281b50720d7ec3e335b574bb83d1 /drivers/char/ipmi/ipmi_bt_sm.c | |
| parent | 4a007ed926fd4cbb4afe4566dbfd252cc49f22fe (diff) | |
| parent | 6368087e851e697679af059b4247aca33a69cef3 (diff) | |
| download | linux-fsl-qoriq-e2a978ec72cffe4739f5ef7618961d6a6209fa66.tar.xz | |
Merge branch 'ipmi' (minor ipmi fixes from Corey)
Merge ipmi fixes from Corey Minyard:
"Some minor fixes I had queued up. The last one came in recently
(patch 4) and it and patch 2 are candidates for stable-kernel."
* emailed patches from Corey Minyard <cminyard@mvista.com>:
ipmi: ipmi_devintf: compat_ioctl method fails to take ipmi_mutex
ipmi: Improve error messages on failed irq enable
drivers/char/ipmi: memcpy, need additional 2 bytes to avoid memory overflow
drivers: char: ipmi: Replaced kmalloc and strcpy with kstrdup
Diffstat (limited to 'drivers/char/ipmi/ipmi_bt_sm.c')
| -rw-r--r-- | drivers/char/ipmi/ipmi_bt_sm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/ipmi/ipmi_bt_sm.c b/drivers/char/ipmi/ipmi_bt_sm.c index cdd4c09f..a22a7a5 100644 --- a/drivers/char/ipmi/ipmi_bt_sm.c +++ b/drivers/char/ipmi/ipmi_bt_sm.c @@ -95,9 +95,9 @@ struct si_sm_data { enum bt_states state; unsigned char seq; /* BT sequence number */ struct si_sm_io *io; - unsigned char write_data[IPMI_MAX_MSG_LENGTH]; + unsigned char write_data[IPMI_MAX_MSG_LENGTH + 2]; /* +2 for memcpy */ int write_count; - unsigned char read_data[IPMI_MAX_MSG_LENGTH]; + unsigned char read_data[IPMI_MAX_MSG_LENGTH + 2]; /* +2 for memcpy */ int read_count; int truncated; long timeout; /* microseconds countdown */ |