Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc4bc702 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

media: dvb-frontends: fix i2c access helpers for KASAN 

commit 3cd890dbe2a4f14cc44c85bb6cf37e5e22d4dd0e upstream.

A typical code fragment was copied across many dvb-frontend drivers and
causes large stack frames when built with with CONFIG_KASAN on gcc-5/6/7:

drivers/media/dvb-frontends/cxd2841er.c:3225:1: error: the frame size of 3992 bytes is larger than 3072 bytes [-Werror=frame-larger-than=]
drivers/media/dvb-frontends/cxd2841er.c:3404:1: error: the frame size of 3136 bytes is larger than 3072 bytes [-Werror=frame-larger-than=]
drivers/media/dvb-frontends/stv0367.c:3143:1: error: the frame size of 4016 bytes is larger than 3072 bytes [-Werror=frame-larger-than=]
drivers/media/dvb-frontends/stv090x.c:3430:1: error: the frame size of 5312 bytes is larger than 3072 bytes [-Werror=frame-larger-than=]
drivers/media/dvb-frontends/stv090x.c:4248:1: error: the frame size of 4872 bytes is larger than 3072 bytes [-Werror=frame-larger-than=]

gcc-8 now solves this by consolidating the stack slots for the argument
variables, but on older compilers we can get the same behavior by taking
the pointer of a local variable rather than the inline function argument.

Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81715



Cc: stable@vger.kernel.org
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent adc143b9

drivers/media/dvb-frontends/ascot2e.c

+3 −1
Original line number Diff line number Diff line
@@ -155,7 +155,9 @@ static int ascot2e_write_regs(struct ascot2e_priv *priv, 


static int ascot2e_write_reg(struct ascot2e_priv *priv, u8 reg, u8 val)

{

	return ascot2e_write_regs(priv, reg, &val, 1);

	u8 tmp = val; /* see gcc.gnu.org/bugzilla/show_bug.cgi?id=81715 */



	return ascot2e_write_regs(priv, reg, &tmp, 1);

}



static int ascot2e_read_regs(struct ascot2e_priv *priv,

drivers/media/dvb-frontends/cxd2841er.c

+3 −1
Original line number Diff line number Diff line
@@ -241,7 +241,9 @@ static int cxd2841er_write_regs(struct cxd2841er_priv *priv, 
static int cxd2841er_write_reg(struct cxd2841er_priv *priv,

			       u8 addr, u8 reg, u8 val)

{

	return cxd2841er_write_regs(priv, addr, reg, &val, 1);

	u8 tmp = val; /* see gcc.gnu.org/bugzilla/show_bug.cgi?id=81715 */



	return cxd2841er_write_regs(priv, addr, reg, &tmp, 1);

}



static int cxd2841er_read_regs(struct cxd2841er_priv *priv,

drivers/media/dvb-frontends/horus3a.c

+3 −1
Original line number Diff line number Diff line
@@ -89,7 +89,9 @@ static int horus3a_write_regs(struct horus3a_priv *priv, 


static int horus3a_write_reg(struct horus3a_priv *priv, u8 reg, u8 val)

{

	return horus3a_write_regs(priv, reg, &val, 1);

	u8 tmp = val; /* see gcc.gnu.org/bugzilla/show_bug.cgi?id=81715 */



	return horus3a_write_regs(priv, reg, &tmp, 1);

}



static int horus3a_enter_power_save(struct horus3a_priv *priv)

drivers/media/dvb-frontends/itd1000.c

+3 −2
Original line number Diff line number Diff line
@@ -99,8 +99,9 @@ static int itd1000_read_reg(struct itd1000_state *state, u8 reg) 


static inline int itd1000_write_reg(struct itd1000_state *state, u8 r, u8 v)

{

	int ret = itd1000_write_regs(state, r, &v, 1);

	state->shadow[r] = v;

	u8 tmp = v; /* see gcc.gnu.org/bugzilla/show_bug.cgi?id=81715 */

	int ret = itd1000_write_regs(state, r, &tmp, 1);

	state->shadow[r] = tmp;

	return ret;

}

drivers/media/dvb-frontends/mt312.c

+4 −1
Original line number Diff line number Diff line
@@ -142,7 +142,10 @@ static inline int mt312_readreg(struct mt312_state *state, 
static inline int mt312_writereg(struct mt312_state *state,

				 const enum mt312_reg_addr reg, const u8 val)

{

	return mt312_write(state, reg, &val, 1);

	u8 tmp = val; /* see gcc.gnu.org/bugzilla/show_bug.cgi?id=81715 */





	return mt312_write(state, reg, &tmp, 1);

}



static inline u32 mt312_div(u32 a, u32 b)