From patchwork Thu Mar 2 16:38:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9601061 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EC37560453 for ; Thu, 2 Mar 2017 17:13:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D805126BE9 for ; Thu, 2 Mar 2017 17:13:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC753283EE; Thu, 2 Mar 2017 17:13:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0D36B285BB for ; Thu, 2 Mar 2017 17:13:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754828AbdCBRNK (ORCPT ); Thu, 2 Mar 2017 12:13:10 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:51994 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752658AbdCBRLM (ORCPT ); Thu, 2 Mar 2017 12:11:12 -0500 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0MP5C3-1ch1Ze2ZZX-006M5i; Thu, 02 Mar 2017 17:38:49 +0100 From: Arnd Bergmann To: kasan-dev@googlegroups.com Cc: Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-wireless@vger.kernel.org, kernel-build-reports@lists.linaro.org, "David S . Miller" , Arnd Bergmann Subject: [PATCH 05/26] netlink: mark nla_put_{u8, u16, u32} noinline_for_kasan Date: Thu, 2 Mar 2017 17:38:13 +0100 Message-Id: <20170302163834.2273519-6-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170302163834.2273519-1-arnd@arndb.de> References: <20170302163834.2273519-1-arnd@arndb.de> X-Provags-ID: V03:K0:uuSOjDuGqblPh7qUGgyfapLWtVSnn9UBBJ7Euwe+yzYvv5ewvUp YuvyCZ6ee+QjnTwBmErDxGMp2edc22yjHmm4huukSOCjAF3zbE2DWLNw7p3tDohmMsNrU9a K3tk6SUV1IK3/XpakAZ6t37wDkx5+8GkYYwBSRhODFlLm+3GoR24PAGVCkGadC8PwSqIakM ULheYW4nU7P67piqdp85g== X-UI-Out-Filterresults: notjunk:1; V01:K0:s7dBX2syeB8=:g8MdZDmgjV+FsrzL0OaP5E rmJW3zYLM8wMH1UWz3vd8n1NFKSeqeQNRDTW8ZC1JpE5AyP29T8GD7/0J7NX80a+bEQzK1xN2 sqq/4edSisCRmUOfR0BSf4jVXTMaL/0rq5Dx2jCiUjZ57yS5l/jrAs4NTfdX76sbefxzCyt/w qMnnYwytpwJ8GOvEahoBkNLHNqraKDsp7rc+SMg68L/ZJe5HiFU2Mdm/jxg3Gy6zw8jeCgENJ S1Vao5V8pB5eMaEqnRqLHuAggY/9VS8E0GGQL2Nc4iB2M6bby1RyaOSG7zh7KM/RsxEA1pYaS wr1QcUx/AUYx3nOz0gRB6u6exFiT3sTtQNbPSNrBxk8IsV0+H3g1U6ZPxVVgiWIKjT1EH8PSh WYdSWQ76Rclcw57AUEPo4Jx6KMkoZTS+KwdvpYtddcts9vsCVXGhz/fZVX71pV4LRtAoTyWqw W1P+YTOzaktcD3E0DSHugbV9XpG6rvmUXwcwovlRoxS6Na2+lpDk//0fix2lIFrbVypxI2LwS EbGUBLd6IfFAnAR0f/yBuNGb9xTiVQhZu0bQlLUF7Uu7xCt8sJrPREePMRy3nrV09v0G0ULEn eELgFs5OlLQva+y26dEELOUtx2dq98R1sysDxO9BDoRHolDjBcTYl5mcjevix4pu8T4rNXFdl 11w3UuFc3fQkAFViVGoEXpcP/Mqa6QwgHDoXdmRQf2lE35tgb2zQz477/pMOHT2jHZVY= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When CONFIG_KASAN is enabled, the "--param asan-stack=1" causes rather large stack frames in some functions. This goes unnoticed normally because CONFIG_FRAME_WARN is disabled with CONFIG_KASAN by default as of commit 3f181b4d8652 ("lib/Kconfig.debug: disable -Wframe-larger-than warnings with KASAN=y"). The kernelci.org build bot however has the warning enabled and that led me to investigate it a little further, as every build produces these warnings: net/wireless/nl80211.c:4389:1: warning: the frame size of 2240 bytes is larger than 2048 bytes [-Wframe-larger-than=] net/wireless/nl80211.c:1895:1: warning: the frame size of 3776 bytes is larger than 2048 bytes [-Wframe-larger-than=] net/wireless/nl80211.c:1410:1: warning: the frame size of 2208 bytes is larger than 2048 bytes [-Wframe-larger-than=] net/bridge/br_netlink.c:1282:1: warning: the frame size of 2544 bytes is larger than 2048 bytes [-Wframe-larger-than=] With the new noinline_for_kasan annotation, we can avoid the problem when KASAN is enabled but not change anything otherwise. Cc: Andrey Ryabinin Cc: Alexander Potapenko Cc: Dmitry Vyukov Cc: kasan-dev@googlegroups.com Signed-off-by: Arnd Bergmann --- include/net/netlink.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/include/net/netlink.h b/include/net/netlink.h index b239fcd33d80..d84878d8347f 100644 --- a/include/net/netlink.h +++ b/include/net/netlink.h @@ -755,7 +755,7 @@ static inline int nla_parse_nested(struct nlattr *tb[], int maxtype, * @attrtype: attribute type * @value: numeric value */ -static inline int nla_put_u8(struct sk_buff *skb, int attrtype, u8 value) +static noinline_for_kasan int nla_put_u8(struct sk_buff *skb, int attrtype, u8 value) { return nla_put(skb, attrtype, sizeof(u8), &value); } @@ -766,7 +766,7 @@ static inline int nla_put_u8(struct sk_buff *skb, int attrtype, u8 value) * @attrtype: attribute type * @value: numeric value */ -static inline int nla_put_u16(struct sk_buff *skb, int attrtype, u16 value) +static noinline_for_kasan int nla_put_u16(struct sk_buff *skb, int attrtype, u16 value) { return nla_put(skb, attrtype, sizeof(u16), &value); } @@ -777,7 +777,7 @@ static inline int nla_put_u16(struct sk_buff *skb, int attrtype, u16 value) * @attrtype: attribute type * @value: numeric value */ -static inline int nla_put_be16(struct sk_buff *skb, int attrtype, __be16 value) +static noinline_for_kasan int nla_put_be16(struct sk_buff *skb, int attrtype, __be16 value) { return nla_put(skb, attrtype, sizeof(__be16), &value); } @@ -788,7 +788,7 @@ static inline int nla_put_be16(struct sk_buff *skb, int attrtype, __be16 value) * @attrtype: attribute type * @value: numeric value */ -static inline int nla_put_net16(struct sk_buff *skb, int attrtype, __be16 value) +static noinline_for_kasan int nla_put_net16(struct sk_buff *skb, int attrtype, __be16 value) { return nla_put_be16(skb, attrtype | NLA_F_NET_BYTEORDER, value); } @@ -799,7 +799,7 @@ static inline int nla_put_net16(struct sk_buff *skb, int attrtype, __be16 value) * @attrtype: attribute type * @value: numeric value */ -static inline int nla_put_le16(struct sk_buff *skb, int attrtype, __le16 value) +static noinline_for_kasan int nla_put_le16(struct sk_buff *skb, int attrtype, __le16 value) { return nla_put(skb, attrtype, sizeof(__le16), &value); } @@ -810,7 +810,7 @@ static inline int nla_put_le16(struct sk_buff *skb, int attrtype, __le16 value) * @attrtype: attribute type * @value: numeric value */ -static inline int nla_put_u32(struct sk_buff *skb, int attrtype, u32 value) +static noinline_for_kasan int nla_put_u32(struct sk_buff *skb, int attrtype, u32 value) { return nla_put(skb, attrtype, sizeof(u32), &value); } @@ -821,7 +821,7 @@ static inline int nla_put_u32(struct sk_buff *skb, int attrtype, u32 value) * @attrtype: attribute type * @value: numeric value */ -static inline int nla_put_be32(struct sk_buff *skb, int attrtype, __be32 value) +static noinline_for_kasan int nla_put_be32(struct sk_buff *skb, int attrtype, __be32 value) { return nla_put(skb, attrtype, sizeof(__be32), &value); } @@ -832,7 +832,7 @@ static inline int nla_put_be32(struct sk_buff *skb, int attrtype, __be32 value) * @attrtype: attribute type * @value: numeric value */ -static inline int nla_put_net32(struct sk_buff *skb, int attrtype, __be32 value) +static noinline_for_kasan int nla_put_net32(struct sk_buff *skb, int attrtype, __be32 value) { return nla_put_be32(skb, attrtype | NLA_F_NET_BYTEORDER, value); } @@ -843,7 +843,7 @@ static inline int nla_put_net32(struct sk_buff *skb, int attrtype, __be32 value) * @attrtype: attribute type * @value: numeric value */ -static inline int nla_put_le32(struct sk_buff *skb, int attrtype, __le32 value) +static noinline_for_kasan int nla_put_le32(struct sk_buff *skb, int attrtype, __le32 value) { return nla_put(skb, attrtype, sizeof(__le32), &value); } @@ -855,7 +855,7 @@ static inline int nla_put_le32(struct sk_buff *skb, int attrtype, __le32 value) * @value: numeric value * @padattr: attribute type for the padding */ -static inline int nla_put_u64_64bit(struct sk_buff *skb, int attrtype, +static noinline_for_kasan int nla_put_u64_64bit(struct sk_buff *skb, int attrtype, u64 value, int padattr) { return nla_put_64bit(skb, attrtype, sizeof(u64), &value, padattr); @@ -868,7 +868,7 @@ static inline int nla_put_u64_64bit(struct sk_buff *skb, int attrtype, * @value: numeric value * @padattr: attribute type for the padding */ -static inline int nla_put_be64(struct sk_buff *skb, int attrtype, __be64 value, +static noinline_for_kasan int nla_put_be64(struct sk_buff *skb, int attrtype, __be64 value, int padattr) { return nla_put_64bit(skb, attrtype, sizeof(__be64), &value, padattr); @@ -881,7 +881,7 @@ static inline int nla_put_be64(struct sk_buff *skb, int attrtype, __be64 value, * @value: numeric value * @padattr: attribute type for the padding */ -static inline int nla_put_net64(struct sk_buff *skb, int attrtype, __be64 value, +static noinline_for_kasan int nla_put_net64(struct sk_buff *skb, int attrtype, __be64 value, int padattr) { return nla_put_be64(skb, attrtype | NLA_F_NET_BYTEORDER, value, @@ -895,7 +895,7 @@ static inline int nla_put_net64(struct sk_buff *skb, int attrtype, __be64 value, * @value: numeric value * @padattr: attribute type for the padding */ -static inline int nla_put_le64(struct sk_buff *skb, int attrtype, __le64 value, +static noinline_for_kasan int nla_put_le64(struct sk_buff *skb, int attrtype, __le64 value, int padattr) { return nla_put_64bit(skb, attrtype, sizeof(__le64), &value, padattr); @@ -907,7 +907,7 @@ static inline int nla_put_le64(struct sk_buff *skb, int attrtype, __le64 value, * @attrtype: attribute type * @value: numeric value */ -static inline int nla_put_s8(struct sk_buff *skb, int attrtype, s8 value) +static noinline_for_kasan int nla_put_s8(struct sk_buff *skb, int attrtype, s8 value) { return nla_put(skb, attrtype, sizeof(s8), &value); } @@ -918,7 +918,7 @@ static inline int nla_put_s8(struct sk_buff *skb, int attrtype, s8 value) * @attrtype: attribute type * @value: numeric value */ -static inline int nla_put_s16(struct sk_buff *skb, int attrtype, s16 value) +static noinline_for_kasan int nla_put_s16(struct sk_buff *skb, int attrtype, s16 value) { return nla_put(skb, attrtype, sizeof(s16), &value); } @@ -929,7 +929,7 @@ static inline int nla_put_s16(struct sk_buff *skb, int attrtype, s16 value) * @attrtype: attribute type * @value: numeric value */ -static inline int nla_put_s32(struct sk_buff *skb, int attrtype, s32 value) +static noinline_for_kasan int nla_put_s32(struct sk_buff *skb, int attrtype, s32 value) { return nla_put(skb, attrtype, sizeof(s32), &value); } @@ -941,7 +941,7 @@ static inline int nla_put_s32(struct sk_buff *skb, int attrtype, s32 value) * @value: numeric value * @padattr: attribute type for the padding */ -static inline int nla_put_s64(struct sk_buff *skb, int attrtype, s64 value, +static noinline_for_kasan int nla_put_s64(struct sk_buff *skb, int attrtype, s64 value, int padattr) { return nla_put_64bit(skb, attrtype, sizeof(s64), &value, padattr); @@ -976,7 +976,7 @@ static inline int nla_put_flag(struct sk_buff *skb, int attrtype) * @njiffies: number of jiffies to convert to msecs * @padattr: attribute type for the padding */ -static inline int nla_put_msecs(struct sk_buff *skb, int attrtype, +static noinline_for_kasan int nla_put_msecs(struct sk_buff *skb, int attrtype, unsigned long njiffies, int padattr) { u64 tmp = jiffies_to_msecs(njiffies);