From: Vladimir Oltean <vladimir.oltean@nxp.com>
To: Hangbin Liu <liuhangbin@gmail.com>
Cc: "netdev@vger.kernel.org" <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>,
Jakub Kicinski <kuba@kernel.org>, 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"
<syzbot+92beb3d46aab498710fa@syzkaller.appspotmail.com>
Subject: Re: [PATCH RESEND net] bonding: fix missed rcu protection
Date: Fri, 13 May 2022 23:59:18 +0000 [thread overview]
Message-ID: <20220513235917.ptywcm65aydz57sk@skbuf> (raw)
In-Reply-To: <20220513103350.384771-1-liuhangbin@gmail.com>
On Fri, May 13, 2022 at 06:33:50PM +0800, Hangbin Liu wrote:
> When removing the rcu_read_lock in bond_ethtool_get_ts_info(), I didn't
> notice it could be called via setsockopt, which doesn't hold rcu lock,
> as syzbot pointed:
>
> stack backtrace:
> CPU: 0 PID: 3599 Comm: syz-executor317 Not tainted 5.18.0-rc5-syzkaller-01392-g01f4685797a5 #0
> Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
> Call Trace:
> <TASK>
> __dump_stack lib/dump_stack.c:88 [inline]
> dump_stack_lvl+0xcd/0x134 lib/dump_stack.c:106
> bond_option_active_slave_get_rcu include/net/bonding.h:353 [inline]
> bond_ethtool_get_ts_info+0x32c/0x3a0 drivers/net/bonding/bond_main.c:5595
> __ethtool_get_ts_info+0x173/0x240 net/ethtool/common.c:554
> ethtool_get_phc_vclocks+0x99/0x110 net/ethtool/common.c:568
> sock_timestamping_bind_phc net/core/sock.c:869 [inline]
> sock_set_timestamping+0x3a3/0x7e0 net/core/sock.c:916
> sock_setsockopt+0x543/0x2ec0 net/core/sock.c:1221
> __sys_setsockopt+0x55e/0x6a0 net/socket.c:2223
> __do_sys_setsockopt net/socket.c:2238 [inline]
> __se_sys_setsockopt net/socket.c:2235 [inline]
> __x64_sys_setsockopt+0xba/0x150 net/socket.c:2235
> do_syscall_x64 arch/x86/entry/common.c:50 [inline]
> do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80
> entry_SYSCALL_64_after_hwframe+0x44/0xae
> RIP: 0033:0x7f8902c8eb39
>
> Fix it by adding rcu_read_lock during the whole slave dev get_ts_info period.
>
> Reported-by: syzbot+92beb3d46aab498710fa@syzkaller.appspotmail.com
> Fixes: aa6034678e87 ("bonding: use rcu_dereference_rtnl when get bonding active slave")
> Suggested-by: Vladimir Oltean <vladimir.oltean@nxp.com>
> Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
> ---
General feedback, the whole stack trace kind of clutters the commit
message and you could trim most of it. Otherwise the patch looks good to me.
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
next prev parent reply other threads:[~2022-05-14 2:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-13 10:33 [PATCH RESEND net] bonding: fix missed rcu protection Hangbin Liu
2022-05-13 13:23 ` Jonathan Toppins
2022-05-13 23:59 ` Vladimir Oltean [this message]
2022-05-17 1:10 ` Jakub Kicinski
2022-05-17 3:42 ` Hangbin Liu
2022-05-17 7:24 ` Paolo Abeni
2022-05-17 8:04 ` Hangbin Liu
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=20220513235917.ptywcm65aydz57sk@skbuf \
--to=vladimir.oltean@nxp.com \
--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=kuba@kernel.org \
--cc=liuhangbin@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=syzbot+92beb3d46aab498710fa@syzkaller.appspotmail.com \
--cc=vfalico@gmail.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