From: Dong Chenchen <dongchenchen2@huawei.com> hulk inclusion category: cleanup bugzilla: https://atomgit.com/src-openeuler/kernel/issues/15230 CVE: CVE-2026-45905 -------------------------------- Revert the kabi change introduced by including <trace/events/icmp.h> for kabi trustlist standardization. Fixes: db3efdcf70c7 ("net/ipv4: add tracepoint for icmp_send") Signed-off-by: Dong Chenchen <dongchenchen2@huawei.com> --- net/ipv4/icmp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index c8e50dd4642d..b28ec4442a60 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c @@ -90,19 +90,21 @@ #include <linux/uaccess.h> #include <net/checksum.h> #include <net/xfrm.h> #include <net/inet_common.h> #include <net/ip_fib.h> #include <net/l3mdev.h> #include <net/addrconf.h> #include <net/inet_dscp.h> #define CREATE_TRACE_POINTS +#ifndef __GENKSYMS__ #include <trace/events/icmp.h> +#endif /* * Build xmit assembly blocks */ struct icmp_bxm { struct sk_buff *skb; int offset; int data_len; @@ -798,19 +800,21 @@ void __icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info, icmp_param.head_len = sizeof(struct icmphdr); /* if we don't have a source address at this point, fall back to the * dummy address instead of sending out a packet with a source address * of 0.0.0.0 */ if (!fl4.saddr) fl4.saddr = htonl(INADDR_DUMMY); +#ifndef __GENKSYMS__ trace_icmp_send(skb_in, type, code); +#endif icmp_push_reply(sk, &icmp_param, &fl4, &ipc, &rt); ende: ip_rt_put(rt); out_unlock: icmp_xmit_unlock(sk); out_bh_enable: local_bh_enable(); out: -- 2.43.0