aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb-frontends/stv0367.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <m.chehab@samsung.com>2013-11-02 04:17:01 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-04 13:57:33 -0500
commit6d3ac5e79294ecf2c437de63e9a38d125b7c5922 (patch)
treec8d582694554368ac0074b35cd9c54d0b4c6fa87 /drivers/media/dvb-frontends/stv0367.c
parentbea929cb3ef0887cccf8e30331574f23f530ba99 (diff)
media: stv0367: Don't use dynamic static allocation
commit 9aca4fb0571ce9cfef680ceb08d19dd008015307 upstream. Dynamic static allocation is evil, as Kernel stack is too low, and compilation complains about it on some archs: drivers/media/dvb-frontends/stv0367.c:791:1: warning: 'stv0367_writeregs.constprop.4' 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: Mauro Carvalho Chehab <m.chehab@samsung.com> Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/media/dvb-frontends/stv0367.c')
-rw-r--r--drivers/media/dvb-frontends/stv0367.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/media/dvb-frontends/stv0367.c b/drivers/media/dvb-frontends/stv0367.c
index 0c8e45949b11..f6c7277999fe 100644
--- a/drivers/media/dvb-frontends/stv0367.c
+++ b/drivers/media/dvb-frontends/stv0367.c
@@ -33,6 +33,9 @@
33#include "stv0367_regs.h" 33#include "stv0367_regs.h"
34#include "stv0367_priv.h" 34#include "stv0367_priv.h"
35 35
36/* Max transfer size done by I2C transfer functions */
37#define MAX_XFER_SIZE 64
38
36static int stvdebug; 39static int stvdebug;
37module_param_named(debug, stvdebug, int, 0644); 40module_param_named(debug, stvdebug, int, 0644);
38 41
@@ -767,7 +770,7 @@ static struct st_register def0367cab[STV0367CAB_NBREGS] = {
767static 770static
768int stv0367_writeregs(struct stv0367_state *state, u16 reg, u8 *data, int len) 771int stv0367_writeregs(struct stv0367_state *state, u16 reg, u8 *data, int len)
769{ 772{
770 u8 buf[len + 2]; 773 u8 buf[MAX_XFER_SIZE];
771 struct i2c_msg msg = { 774 struct i2c_msg msg = {
772 .addr = state->config->demod_address, 775 .addr = state->config->demod_address,
773 .flags = 0, 776 .flags = 0,
@@ -776,6 +779,14 @@ int stv0367_writeregs(struct stv0367_state *state, u16 reg, u8 *data, int len)
776 }; 779 };
777 int ret; 780 int ret;
778 781
782 if (2 + len > sizeof(buf)) {
783 printk(KERN_WARNING
784 "%s: i2c wr reg=%04x: len=%d is too big!\n",
785 KBUILD_MODNAME, reg, len);
786 return -EINVAL;
787 }
788
789
779 buf[0] = MSB(reg); 790 buf[0] = MSB(reg);
780 buf[1] = LSB(reg); 791 buf[1] = LSB(reg);
781 memcpy(buf + 2, data, len); 792 memcpy(buf + 2, data, len);