From: Jakub Kicinski <kuba@kernel.org>
To: Hangbin Liu <liuhangbin@gmail.com>
Cc: netdev@vger.kernel.org, Jay Vosburgh <j.vosburgh@gmail.com>,
Veaceslav Falico <vfalico@gmail.com>,
Andy Gospodarek <andy@greyhouse.net>,
"David S . Miller" <davem@davemloft.net>,
David Ahern <dsahern@gmail.com>,
Jonathan Toppins <jtoppins@redhat.com>,
Eric Dumazet <eric.dumazet@gmail.com>,
Paolo Abeni <pabeni@redhat.com>,
syzbot+92beb3d46aab498710fa@syzkaller.appspotmail.com,
Vladimir Oltean <vladimir.oltean@nxp.com>
Subject: Re: [PATCHv2 net] bonding: fix missed rcu protection
Date: Tue, 17 May 2022 10:54:45 -0700 [thread overview]
Message-ID: <20220517105445.355b1d22@kernel.org> (raw)
In-Reply-To: <20220517082312.805824-1-liuhangbin@gmail.com>
On Tue, 17 May 2022 16:23:12 +0800 Hangbin Liu wrote:
> + rcu_read_lock();
> real_dev = bond_option_active_slave_get_rcu(bond);
> if (real_dev) {
> + dev_hold(real_dev);
> + rcu_read_unlock();
> ops = real_dev->ethtool_ops;
> phydev = real_dev->phydev;
>
> if (phy_has_tsinfo(phydev)) {
> - return phy_ts_info(phydev, info);
> + ret = phy_ts_info(phydev, info);
> + goto out;
> } else if (ops->get_ts_info) {
> - return ops->get_ts_info(real_dev, info);
> + ret = ops->get_ts_info(real_dev, info);
> + goto out;
> }
> + } else {
> + rcu_read_unlock();
> }
>
> info->so_timestamping = SOF_TIMESTAMPING_RX_SOFTWARE |
> SOF_TIMESTAMPING_SOFTWARE;
> info->phc_index = -1;
>
> - return 0;
> +out:
> + if (real_dev)
> + dev_put(real_dev);
dev_hold() and dev_put() can take NULL these days, for better or worse.
I think the code simplification is worth making use of that, even tho
it will make the backport slightly more tricky (perhaps make a not of
this in the commit message).
next prev parent reply other threads:[~2022-05-17 17:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-17 8:23 [PATCHv2 net] bonding: fix missed rcu protection Hangbin Liu
2022-05-17 17:32 ` Jonathan Toppins
2022-05-18 2:18 ` Hangbin Liu
2022-05-18 15:54 ` Jonathan Toppins
2022-05-19 14:34 ` Vladimir Oltean
2022-05-17 17:54 ` Jakub Kicinski [this message]
2022-05-17 18:25 ` Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220517105445.355b1d22@kernel.org \
--to=kuba@kernel.org \
--cc=andy@greyhouse.net \
--cc=davem@davemloft.net \
--cc=dsahern@gmail.com \
--cc=eric.dumazet@gmail.com \
--cc=j.vosburgh@gmail.com \
--cc=jtoppins@redhat.com \
--cc=liuhangbin@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=syzbot+92beb3d46aab498710fa@syzkaller.appspotmail.com \
--cc=vfalico@gmail.com \
--cc=vladimir.oltean@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).