提交 278ba83a 编写于 作者: M Mauro Carvalho Chehab

[media] cimax2: Don't use dynamic static allocation

Dynamic static allocation is evil, as Kernel stack is too low, and
compilation complains about it on some archs:
        drivers/media/pci/cx23885/cimax2.c:149:1: warning: 'netup_write_i2c' uses dynamic stack allocation [enabled by default]
Instead, let's enforce a limit for the buffer. Considering that I2C
transfers are generally limited, and that devices used on USB has a
max data length of 64 bytes for the control URBs.
So, it seem safe to use 64 bytes as the hard limit for all those devices.
On most cases, the limit is a way lower than that, but this limit
is small enough to not affect the Kernel stack, and it is a no brain
limit, as using smaller ones would require to either carefully each
driver or to take a look on each datasheet.
Signed-off-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
Reviewed-by: NHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: NMauro Carvalho Chehab <m.chehab@samsung.com>
上级 56ac0337
...@@ -26,6 +26,10 @@ ...@@ -26,6 +26,10 @@
#include "cx23885.h" #include "cx23885.h"
#include "cimax2.h" #include "cimax2.h"
#include "dvb_ca_en50221.h" #include "dvb_ca_en50221.h"
/* Max transfer size done by I2C transfer functions */
#define MAX_XFER_SIZE 64
/**** Bit definitions for MC417_RWD and MC417_OEN registers *** /**** Bit definitions for MC417_RWD and MC417_OEN registers ***
bits 31-16 bits 31-16
+-----------+ +-----------+
...@@ -125,7 +129,7 @@ static int netup_write_i2c(struct i2c_adapter *i2c_adap, u8 addr, u8 reg, ...@@ -125,7 +129,7 @@ static int netup_write_i2c(struct i2c_adapter *i2c_adap, u8 addr, u8 reg,
u8 *buf, int len) u8 *buf, int len)
{ {
int ret; int ret;
u8 buffer[len + 1]; u8 buffer[MAX_XFER_SIZE];
struct i2c_msg msg = { struct i2c_msg msg = {
.addr = addr, .addr = addr,
...@@ -134,6 +138,13 @@ static int netup_write_i2c(struct i2c_adapter *i2c_adap, u8 addr, u8 reg, ...@@ -134,6 +138,13 @@ static int netup_write_i2c(struct i2c_adapter *i2c_adap, u8 addr, u8 reg,
.len = len + 1 .len = len + 1
}; };
if (1 + len > sizeof(buffer)) {
printk(KERN_WARNING
"%s: i2c wr reg=%04x: len=%d is too big!\n",
KBUILD_MODNAME, reg, len);
return -EINVAL;
}
buffer[0] = reg; buffer[0] = reg;
memcpy(&buffer[1], buf, len); memcpy(&buffer[1], buf, len);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册