Commit a5885855 authored by Marcin Slusarz's avatar Marcin Slusarz Committed by Mauro Carvalho Chehab

V4L/DVB (7286): limit stack usage of ir-kbd-i2c.c

ir_probe allocated struct i2c_client on stack;
it's pretty big structure, so allocate it with kzalloc

make checkstack output without this patch:
x059d ir_probe [ir-kbd-i2c]:                           1000
Signed-off-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 1c3bf598
...@@ -509,9 +509,9 @@ static int ir_probe(struct i2c_adapter *adap) ...@@ -509,9 +509,9 @@ static int ir_probe(struct i2c_adapter *adap)
static const int probe_cx88[] = { 0x18, 0x6b, 0x71, -1 }; static const int probe_cx88[] = { 0x18, 0x6b, 0x71, -1 };
static const int probe_cx23885[] = { 0x6b, -1 }; static const int probe_cx23885[] = { 0x6b, -1 };
const int *probe = NULL; const int *probe = NULL;
struct i2c_client c; struct i2c_client *c;
unsigned char buf; unsigned char buf;
int i,rc; int i, rc;
switch (adap->id) { switch (adap->id) {
case I2C_HW_B_BT848: case I2C_HW_B_BT848:
...@@ -536,19 +536,23 @@ static int ir_probe(struct i2c_adapter *adap) ...@@ -536,19 +536,23 @@ static int ir_probe(struct i2c_adapter *adap)
if (NULL == probe) if (NULL == probe)
return 0; return 0;
memset(&c,0,sizeof(c)); c = kzalloc(sizeof(*c), GFP_KERNEL);
c.adapter = adap; if (!c)
return -ENOMEM;
c->adapter = adap;
for (i = 0; -1 != probe[i]; i++) { for (i = 0; -1 != probe[i]; i++) {
c.addr = probe[i]; c->addr = probe[i];
rc = i2c_master_recv(&c,&buf,0); rc = i2c_master_recv(c, &buf, 0);
dprintk(1,"probe 0x%02x @ %s: %s\n", dprintk(1,"probe 0x%02x @ %s: %s\n",
probe[i], adap->name, probe[i], adap->name,
(0 == rc) ? "yes" : "no"); (0 == rc) ? "yes" : "no");
if (0 == rc) { if (0 == rc) {
ir_attach(adap,probe[i],0,0); ir_attach(adap, probe[i], 0, 0);
break; break;
} }
} }
kfree(c);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment