Offering: HULK hulk inclusion category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IA436B CVE: CVE-2024-36971
--------------------------------
Fix kabi breakage in struct dst_ops.
Fixes: 92f1655aa2b2 ("net: fix __dst_negative_advice() race") Signed-off-by: Liu Jian liujian56@huawei.com --- include/net/dst_ops.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/net/dst_ops.h b/include/net/dst_ops.h index e2cd4a1f11e6..82cd53eff4ed 100644 --- a/include/net/dst_ops.h +++ b/include/net/dst_ops.h @@ -25,7 +25,8 @@ struct dst_ops { void (*destroy)(struct dst_entry *); void (*ifdown)(struct dst_entry *, struct net_device *dev); - void (*negative_advice)(struct sock *sk, struct dst_entry *); + KABI_REPLACE(struct dst_entry * (*negative_advice)(struct dst_entry *), + void (*negative_advice)(struct sock *sk, struct dst_entry *)) void (*link_failure)(struct sk_buff *); void (*update_pmtu)(struct dst_entry *dst, struct sock *sk, struct sk_buff *skb, u32 mtu,