Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-23 11:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipmi: ipmb: don't allocate i2c_client on stack

Browse Source 
The i2c_client structure can be fairly large, which leads to
a warning about possible kernel stack overflow in some
configurations:

drivers/char/ipmi/ipmb_dev_int.c:115:16: error: stack frame size of 1032 bytes in function 'ipmb_write' [-Werror,-Wframe-larger-than=]

There is no real reason to even declare an i2c_client, as we can simply
call i2c_smbus_xfer() directly instead of the i2c_smbus_write_block_data()
wrapper.

Convert the ipmb_write() to use an open-coded i2c_smbus_write_block_data()
here, without changing the behavior.

It seems that there is another problem with this implementation;
when user space passes a length of more than I2C_SMBUS_BLOCK_MAX
bytes, all the rest is silently ignored. This should probably be
addressed in a separate patch, but I don't know what the intended
behavior is here.

Fixes: 51bd6f2915 ("Add support for IPMB driver")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Message-Id: <20190619125045.918700-1-arnd@arndb.de>
Acked-by: Asmaa Mnebhi <Asmaa@mellanox.com>
[Broke up a line >80 characters on i2c_smbus_xfer().]
Signed-off-by: Corey Minyard <cminyard@mvista.com>
This commit is contained in:
Arnd Bergmann 2019-06-19 14:50:34 +02:00 committed by Corey Minyard
parent 102308f557
commit 21feadd024
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/char/ipmi/ipmb_dev_int.c
View File

@ -117,7 +117,7 @@ static ssize_t ipmb_write(struct file *file, const char __user *buf,
{ {
struct ipmb_dev *ipmb_dev = to_ipmb_dev(file); struct ipmb_dev *ipmb_dev = to_ipmb_dev(file);
u8 rq_sa, netf_rq_lun, msg_len; u8 rq_sa, netf_rq_lun, msg_len;
struct i2c_client rq_client; union i2c_smbus_data data;
u8 msg[MAX_MSG_LEN]; u8 msg[MAX_MSG_LEN];
ssize_t ret; ssize_t ret;
@ -138,17 +138,18 @@ static ssize_t ipmb_write(struct file *file, const char __user *buf,
/* /*
* subtract rq_sa and netf_rq_lun from the length of the msg passed to * subtract rq_sa and netf_rq_lun from the length of the msg passed to
* i2c_smbus_write_block_data_local * i2c_smbus_xfer
*/ */
msg_len = msg[IPMB_MSG_LEN_IDX] - SMBUS_MSG_HEADER_LENGTH; msg_len = msg[IPMB_MSG_LEN_IDX] - SMBUS_MSG_HEADER_LENGTH;
if (msg_len > I2C_SMBUS_BLOCK_MAX)
msg_len = I2C_SMBUS_BLOCK_MAX;
strcpy(rq_client.name, "ipmb_requester"); data.block[0] = msg_len;
rq_client.adapter = ipmb_dev->client->adapter; memcpy(&data.block[1], msg + SMBUS_MSG_IDX_OFFSET, msg_len);
rq_client.flags = ipmb_dev->client->flags; ret = i2c_smbus_xfer(ipmb_dev->client->adapter, rq_sa,
rq_client.addr = rq_sa; ipmb_dev->client->flags,
I2C_SMBUS_WRITE, netf_rq_lun,
ret = i2c_smbus_write_block_data(&rq_client, netf_rq_lun, msg_len, I2C_SMBUS_BLOCK_DATA, &data);
msg + SMBUS_MSG_IDX_OFFSET);
return ret ? : count; return ret ? : count;
} }