From: Arnd Bergmann <arnd@arndb.de> To: Mauro Carvalho Chehab <mchehab@kernel.org> Cc: "Arnd Bergmann" <arnd@arndb.de>, "Jiri Pirko" <jiri@resnulli.us>, "Arend van Spriel" <arend.vanspriel@broadcom.com>, "Kalle Valo" <kvalo@codeaurora.org>, "David S. Miller" <davem@davemloft.net>, "Andrey Ryabinin" <aryabinin@virtuozzo.com>, "Alexander Potapenko" <glider@google.com>, "Dmitry Vyukov" <dvyukov@google.com>, "Masahiro Yamada" <yamada.masahiro@socionext.com>, "Michal Marek" <mmarek@suse.com>, "Andrew Morton" <akpm@linux-foundation.org>, "Kees Cook" <keescook@chromium.org>, "Geert Uytterhoeven" <geert@linux-m68k.org>, "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, brcm80211-dev-list@cypress.com, kasan-dev@googlegroups.com, linux-kbuild@vger.kernel.org, "Jakub Jelinek" <jakub@gcc.gnu.org>, "Martin Liška" <marxin@gcc.gnu.org> Subject: [PATCH v4 5/9] r820t: fix r820t_write_reg for KASAN Date: Fri, 22 Sep 2017 23:29:16 +0200 [thread overview] Message-ID: <20170922212930.620249-6-arnd@arndb.de> (raw) In-Reply-To: <20170922212930.620249-1-arnd@arndb.de> With CONFIG_KASAN, we get an overly long stack frame due to inlining the register access functions: drivers/media/tuners/r820t.c: In function 'generic_set_freq.isra.7': drivers/media/tuners/r820t.c:1334:1: error: the frame size of 2880 bytes is larger than 2048 bytes [-Werror=frame-larger-than=] This is caused by a gcc bug that has now been fixed in gcc-8. To work around the problem, we can pass the register data through a local variable that older gcc versions can optimize out as well. Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81715 Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/media/tuners/r820t.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/media/tuners/r820t.c b/drivers/media/tuners/r820t.c index ba80376a3b86..d097eb04a0e9 100644 --- a/drivers/media/tuners/r820t.c +++ b/drivers/media/tuners/r820t.c @@ -396,9 +396,11 @@ static int r820t_write(struct r820t_priv *priv, u8 reg, const u8 *val, return 0; } -static int r820t_write_reg(struct r820t_priv *priv, u8 reg, u8 val) +static inline int r820t_write_reg(struct r820t_priv *priv, u8 reg, u8 val) { - return r820t_write(priv, reg, &val, 1); + u8 tmp = val; /* work around GCC PR81715 with asan-stack=1 */ + + return r820t_write(priv, reg, &tmp, 1); } static int r820t_read_cache_reg(struct r820t_priv *priv, int reg) @@ -411,17 +413,18 @@ static int r820t_read_cache_reg(struct r820t_priv *priv, int reg) return -EINVAL; } -static int r820t_write_reg_mask(struct r820t_priv *priv, u8 reg, u8 val, +static inline int r820t_write_reg_mask(struct r820t_priv *priv, u8 reg, u8 val, u8 bit_mask) { + u8 tmp = val; int rc = r820t_read_cache_reg(priv, reg); if (rc < 0) return rc; - val = (rc & ~bit_mask) | (val & bit_mask); + tmp = (rc & ~bit_mask) | (tmp & bit_mask); - return r820t_write(priv, reg, &val, 1); + return r820t_write(priv, reg, &tmp, 1); } static int r820t_read(struct r820t_priv *priv, u8 reg, u8 *val, int len) -- 2.9.0
WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@arndb.de> To: Mauro Carvalho Chehab <mchehab@kernel.org> Cc: Arnd Bergmann <arnd@arndb.de>, Jiri Pirko <jiri@resnulli.us>, Arend van Spriel <arend.vanspriel@broadcom.com>, Kalle Valo <kvalo@codeaurora.org>, "David S. Miller" <davem@davemloft.net>, Andrey Ryabinin <aryabinin@virtuozzo.com>, Alexander Potapenko <glider@google.com>, Dmitry Vyukov <dvyukov@google.com>, Masahiro Yamada <yamada.masahiro@socionext.com>, Michal Marek <mmarek@suse.com>, Andrew Morton <akpm@linux-foundation.org>, Kees Cook <keescook@chromium.org>, Geert Uytterhoeven <geert@linux-m68k.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, brcm80211-dev-list@cypress.com, kasan-dev@googlegroups.com Subject: [PATCH v4 5/9] r820t: fix r820t_write_reg for KASAN Date: Fri, 22 Sep 2017 23:29:16 +0200 [thread overview] Message-ID: <20170922212930.620249-6-arnd@arndb.de> (raw) In-Reply-To: <20170922212930.620249-1-arnd@arndb.de> With CONFIG_KASAN, we get an overly long stack frame due to inlining the register access functions: drivers/media/tuners/r820t.c: In function 'generic_set_freq.isra.7': drivers/media/tuners/r820t.c:1334:1: error: the frame size of 2880 bytes is larger than 2048 bytes [-Werror=frame-larger-than=] This is caused by a gcc bug that has now been fixed in gcc-8. To work around the problem, we can pass the register data through a local variable that older gcc versions can optimize out as well. Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81715 Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/media/tuners/r820t.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/media/tuners/r820t.c b/drivers/media/tuners/r820t.c index ba80376a3b86..d097eb04a0e9 100644 --- a/drivers/media/tuners/r820t.c +++ b/drivers/media/tuners/r820t.c @@ -396,9 +396,11 @@ static int r820t_write(struct r820t_priv *priv, u8 reg, const u8 *val, return 0; } -static int r820t_write_reg(struct r820t_priv *priv, u8 reg, u8 val) +static inline int r820t_write_reg(struct r820t_priv *priv, u8 reg, u8 val) { - return r820t_write(priv, reg, &val, 1); + u8 tmp = val; /* work around GCC PR81715 with asan-stack=1 */ + + return r820t_write(priv, reg, &tmp, 1); } static int r820t_read_cache_reg(struct r820t_priv *priv, int reg) @@ -411,17 +413,18 @@ static int r820t_read_cache_reg(struct r820t_priv *priv, int reg) return -EINVAL; } -static int r820t_write_reg_mask(struct r820t_priv *priv, u8 reg, u8 val, +static inline int r820t_write_reg_mask(struct r820t_priv *priv, u8 reg, u8 val, u8 bit_mask) { + u8 tmp = val; int rc = r820t_read_cache_reg(priv, reg); if (rc < 0) return rc; - val = (rc & ~bit_mask) | (val & bit_mask); + tmp = (rc & ~bit_mask) | (tmp & bit_mask); - return r820t_write(priv, reg, &val, 1); + return r820t_write(priv, reg, &tmp, 1); } static int r820t_read(struct r820t_priv *priv, u8 reg, u8 *val, int len) -- 2.9.0
next prev parent reply other threads:[~2017-09-22 21:31 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-09-22 21:29 [PATCH v4 0/9] bring back stack frame warning with KASAN Arnd Bergmann 2017-09-22 21:29 ` Arnd Bergmann 2017-09-22 21:29 ` Arnd Bergmann 2017-09-22 21:29 ` Arnd Bergmann 2017-09-22 21:29 ` [PATCH v4 1/9] brcmsmac: make some local variables 'static const' to reduce stack size Arnd Bergmann 2017-09-22 21:29 ` Arnd Bergmann 2017-09-25 4:33 ` Kalle Valo 2017-09-25 4:33 ` Kalle Valo 2017-10-02 13:53 ` [v4, " Kalle Valo 2017-10-02 13:53 ` Kalle Valo 2017-10-02 13:53 ` Kalle Valo 2017-09-22 21:29 ` [PATCH v4 2/9] brcmsmac: split up wlc_phy_workarounds_nphy Arnd Bergmann 2017-09-22 21:29 ` Arnd Bergmann 2017-10-02 13:55 ` [v4,2/9] " Kalle Valo 2017-10-02 13:55 ` Kalle Valo 2017-10-02 13:55 ` Kalle Valo 2017-10-27 7:51 ` Kalle Valo 2017-10-27 7:51 ` Kalle Valo 2017-10-27 7:51 ` Kalle Valo 2017-09-22 21:29 ` [PATCH v4 3/9] brcmsmac: reindent split functions Arnd Bergmann 2017-09-22 21:29 ` Arnd Bergmann 2017-09-22 21:29 ` [PATCH v4 4/9] em28xx: fix em28xx_dvb_init for KASAN Arnd Bergmann 2017-09-22 21:29 ` Arnd Bergmann 2017-09-25 14:41 ` David Laight 2017-09-25 14:41 ` David Laight 2017-09-26 6:32 ` Arnd Bergmann 2017-09-26 6:32 ` Arnd Bergmann 2017-09-26 6:47 ` Arnd Bergmann 2017-09-26 6:47 ` Arnd Bergmann 2017-09-26 16:49 ` Andrey Ryabinin 2017-09-26 16:49 ` Andrey Ryabinin 2017-09-27 13:26 ` Arnd Bergmann 2017-09-27 13:26 ` Arnd Bergmann 2017-09-28 13:09 ` Andrey Ryabinin 2017-09-28 13:09 ` Andrey Ryabinin 2017-09-28 14:30 ` Arnd Bergmann 2017-09-28 14:30 ` Arnd Bergmann 2017-10-02 8:33 ` Arnd Bergmann 2017-10-02 8:33 ` Arnd Bergmann 2017-10-02 8:40 ` [PATCH] string.h: work around for increased stack usage Arnd Bergmann 2017-10-02 9:02 ` Arnd Bergmann 2017-10-02 14:07 ` Andrey Ryabinin 2017-10-03 18:10 ` kbuild test robot 2017-10-03 18:10 ` kbuild test robot 2017-09-22 21:29 ` Arnd Bergmann [this message] 2017-09-22 21:29 ` [PATCH v4 5/9] r820t: fix r820t_write_reg for KASAN Arnd Bergmann 2017-09-22 21:29 ` [PATCH v4 6/9] dvb-frontends: fix i2c access helpers " Arnd Bergmann 2017-09-22 21:29 ` Arnd Bergmann 2017-09-22 21:29 ` [PATCH v4 7/9] rocker: fix rocker_tlv_put_* functions " Arnd Bergmann 2017-09-22 21:29 ` Arnd Bergmann 2017-09-26 3:19 ` David Miller 2017-09-22 21:29 ` [PATCH v4 8/9] netlink: fix nla_put_{u8,u16,u32} " Arnd Bergmann 2017-09-22 21:29 ` Arnd Bergmann 2017-09-26 3:19 ` David Miller 2017-09-22 21:29 ` [PATCH v4 9/9] kasan: rework Kconfig settings Arnd Bergmann 2017-09-26 19:36 ` Andrey Ryabinin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170922212930.620249-6-arnd@arndb.de \ --to=arnd@arndb.de \ --cc=akpm@linux-foundation.org \ --cc=arend.vanspriel@broadcom.com \ --cc=aryabinin@virtuozzo.com \ --cc=brcm80211-dev-list.pdl@broadcom.com \ --cc=brcm80211-dev-list@cypress.com \ --cc=davem@davemloft.net \ --cc=dvyukov@google.com \ --cc=geert@linux-m68k.org \ --cc=glider@google.com \ --cc=gregkh@linuxfoundation.org \ --cc=jakub@gcc.gnu.org \ --cc=jiri@resnulli.us \ --cc=kasan-dev@googlegroups.com \ --cc=keescook@chromium.org \ --cc=kvalo@codeaurora.org \ --cc=linux-kbuild@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linux-wireless@vger.kernel.org \ --cc=marxin@gcc.gnu.org \ --cc=mchehab@kernel.org \ --cc=mmarek@suse.com \ --cc=netdev@vger.kernel.org \ --cc=yamada.masahiro@socionext.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.