linux-kernel - [PATCH net-next v3] net: skb: prevent the split of kfree_skb

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20220815062727.1203589-1-imagedong@tencent.com>
Date:   Mon, 15 Aug 2022 14:27:27 +0800
From:   menglong8.dong@...il.com
To:     kuba@...nel.org, miguel.ojeda.sandonis@...il.com
Cc:     ojeda@...nel.org, ndesaulniers@...gle.com, davem@...emloft.net,
        edumazet@...gle.com, pabeni@...hat.com, asml.silence@...il.com,
        imagedong@...cent.com, luiz.von.dentz@...el.com,
        vasily.averin@...ux.dev, jk@...econstruct.com.au,
        linux-kernel@...r.kernel.org, netdev@...r.kernel.org,
        kernel test robot <lkp@...el.com>
Subject: [PATCH net-next v3] net: skb: prevent the split of kfree_skb_reason() by gcc

From: Menglong Dong <imagedong@...cent.com>

Sometimes, gcc will optimize the function by spliting it to two or
more functions. In this case, kfree_skb_reason() is splited to
kfree_skb_reason and kfree_skb_reason.part.0. However, the
function/tracepoint trace_kfree_skb() in it needs the return address
of kfree_skb_reason().

This split makes the call chains becomes:
  kfree_skb_reason() -> kfree_skb_reason.part.0 -> trace_kfree_skb()

which makes the return address that passed to trace_kfree_skb() be
kfree_skb().

Therefore, prevent this kind of optimization to kfree_skb_reason() by
making the optimize level to "O1". I think these should be better
method instead of this "O1", but I can't figure it out......

This optimization CAN happen, which depend on the behavior of gcc.
I'm not able to reproduce it in the latest kernel code, but it happens
in my kernel of version 5.4.119. Maybe the latest code already do someting
that prevent this happen?

Signed-off-by: Menglong Dong <imagedong@...cent.com>
Reported-by: kernel test robot <lkp@...el.com>
Reported-by: Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
---
v3:
- define __nofnsplit only for GCC
- add some document

v2:
- replace 'optimize' with '__optimize__' in __nofnsplit, as Miguel Ojeda
  advised.
---
 include/linux/compiler-gcc.h   | 12 ++++++++++++
 include/linux/compiler_types.h |  4 ++++
 net/core/skbuff.c              |  3 ++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index a0c55eeaeaf1..8d6d4d7b21a4 100644
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -157,3 +157,15 @@
 #if GCC_VERSION < 90100
 #undef __alloc_size__
 #endif
+
+/*
+ * Prevent function from being splited to multiple part. As what the
+ * document says in gcc/ipa-split.cc, single function will be splited
+ * when necessary:
+ *
+ *   https://github.com/gcc-mirror/gcc/blob/master/gcc/ipa-split.cc
+ *
+ * This optimization seems only take effect on O2 and O3 optimize level.
+ * Therefore, make the optimize level to O1 to prevent this optimization.
+ */
+#define __nofnsplit		__attribute__((__optimize__("O1")))
diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h
index 4f2a819fd60a..e76cfff36491 100644
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
@@ -380,4 +380,8 @@ struct ftrace_likely_data {
 #define __diag_ignore_all(option, comment)
 #endif
 
+#ifndef __nofnsplit
+#define __nofnsplit
+#endif
+
 #endif /* __LINUX_COMPILER_TYPES_H */
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 974bbbbe7138..ff9ccbc032b9 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -777,7 +777,8 @@ EXPORT_SYMBOL(__kfree_skb);
  *	hit zero. Meanwhile, pass the drop reason to 'kfree_skb'
  *	tracepoint.
  */
-void kfree_skb_reason(struct sk_buff *skb, enum skb_drop_reason reason)
+void __nofnsplit
+kfree_skb_reason(struct sk_buff *skb, enum skb_drop_reason reason)
 {
 	if (!skb_unref(skb))
 		return;
-- 
2.36.1