ipv6: fix skb drops in igmp6_event_query() and igmp6_event_report()
Subsystems (3)
PATCH 1/1 ipv6: fix skb drops in igmp6_event_query() and igmp6_event_report()
From: Eric Dumazet <[email protected]>
While investigating on why a synchronize_net() has been added recently in ipv6_mc_down(), I found that igmp6_event_query() and igmp6_event_report() might drop skbs in some cases.
Discussion about removing synchronize_net() from ipv6_mc_down() will happen in a different thread.
--- include/net/ndisc.h | 4 ++-- net/ipv6/mcast.c | 32 ++++++++++++-------------------- 2 files changed, 14 insertions(+), 22 deletions(-)
include/net/ndisc.h +2 -2
@@ -475,9 +475,9 @@ int igmp6_late_init(void);void igmp6_cleanup (void );void igmp6_late_cleanup (void ); -int igmp6_event_query (struct sk_buff *skb); +void igmp6_event_query (struct sk_buff *skb); -int igmp6_event_report (struct sk_buff *skb); +void igmp6_event_report (struct sk_buff *skb);#ifdef CONFIG_SYSCTL
net/ipv6/mcast.c +12 -20
@@ -1371,27 +1371,23 @@ static void mld_process_v2(struct inet6_dev *idev, struct mld2_query *mld, }/* called with rcu_read_lock() */ -int igmp6_event_query (struct sk_buff *skb) +void igmp6_event_query (struct sk_buff *skb) {struct inet6_dev *idev =__in6_dev_get (skb->dev); -if (!idev) -return -EINVAL ; - -if (idev->dead) { -kfree_skb (skb); -return -ENODEV ; - } +if (!idev || idev->dead) + goto out;spin_lock_bh (&idev->mc_query_lock);if (skb_queue_len (&idev->mc_query_queue) <MLD_MAX_SKBS ) {__skb_queue_tail (&idev->mc_query_queue, skb);if (!mod_delayed_work (mld_wq, &idev->mc_query_work,0 ))in6_dev_hold (idev); + skb =NULL ; }spin_unlock_bh (&idev->mc_query_lock); - -return 0 ; +out: +kfree_skb (skb); }static void __mld_query_work (struct sk_buff *skb)
@@ -1542,27 +1538,23 @@ static void mld_query_work(struct work_struct *work) }/* called with rcu_read_lock() */ -int igmp6_event_report (struct sk_buff *skb) +void igmp6_event_report (struct sk_buff *skb) {struct inet6_dev *idev =__in6_dev_get (skb->dev); -if (!idev) -return -EINVAL ; - -if (idev->dead) { -kfree_skb (skb); -return -ENODEV ; - } +if (!idev || idev->dead) + goto out;spin_lock_bh (&idev->mc_report_lock);if (skb_queue_len (&idev->mc_report_queue) <MLD_MAX_SKBS ) {__skb_queue_tail (&idev->mc_report_queue, skb);if (!mod_delayed_work (mld_wq, &idev->mc_report_work,0 ))in6_dev_hold (idev); + skb =NULL ; }spin_unlock_bh (&idev->mc_report_lock); - -return 0 ; +out: +kfree_skb (skb); }static void __mld_report_work (struct sk_buff *skb)
Signature · 1 line
2.35.1.616.g0bdcbb4464-goog
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Thu, 3 Mar 2022 09:37:28 -0800 you wrote:
From: Eric Dumazet <[email protected]>
While investigating on why a
synchronize_net()has been added recently inipv6_mc_down(), I found thatigmp6_event_query()andigmp6_event_report()might drop skbs in some cases.Discussion about removing
synchronize_net()fromipv6_mc_down()will happen in a different thread.[...]
Here is the summary with links:
- [net] ipv6: fix skb drops in igmp6_event_query() and igmp6_event_report()
https://git.kernel.org/netdev/net/c/2d3916f31891
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html