netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Oliver Hartkopp <socketcan@hartkopp.net>
To: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>,
	linux-can@vger.kernel.org
Cc: Marc Kleine-Budde <mkl@pengutronix.de>,
	"David S. Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	syzbot+0f7e7e5e2f4f40fa89c0@syzkaller.appspotmail.com,
	Norbert Slusarek <nslusarek@gmx.net>
Subject: Re: [PATCH] can: bcm: delay release of struct bcm_op after synchronize_rcu
Date: Sat, 19 Jun 2021 18:25:47 +0200	[thread overview]
Message-ID: <685d97b7-3129-251f-9b44-03c636a44845@hartkopp.net> (raw)
In-Reply-To: <20210619161813.2098382-1-cascardo@canonical.com>



On 19.06.21 18:18, Thadeu Lima de Souza Cascardo wrote:
> can_rx_register callbacks may be called concurrently to the call to
> can_rx_unregister. The callbacks and callback data, though, are protected by
> RCU and the struct sock reference count.
> 
> So the callback data is really attached to the life of sk, meaning that it
> should be released on sk_destruct. However, bcm_remove_op calls tasklet_kill,
> and RCU callbacks may be called under RCU softirq, so that cannot be used on
> kernels before the introduction of HRTIMER_MODE_SOFT.
> 
> However, bcm_rx_handler is called under RCU protection, so after calling
> can_rx_unregister, we may call synchronize_rcu in order to wait for any RCU
> read-side critical sections to finish. That is, bcm_rx_handler won't be called
> anymore for those ops. So, we only free them, after we do that synchronize_rcu.
> 
> Reported-by: syzbot+0f7e7e5e2f4f40fa89c0@syzkaller.appspotmail.com
> Reported-by: Norbert Slusarek <nslusarek@gmx.net>
> Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

Fixes: ffd980f976e7 ("[CAN]: Add broadcast manager (bcm) protocol")
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>

Thanks Norbert for reporting and Thadeu for working out the fix!

Best regards,
Oliver

> ---
>   net/can/bcm.c | 6 ++++++
>   1 file changed, 6 insertions(+)
> 
> diff --git a/net/can/bcm.c b/net/can/bcm.c
> index f3e4d9528fa3..c67916020e63 100644
> --- a/net/can/bcm.c
> +++ b/net/can/bcm.c
> @@ -785,6 +785,7 @@ static int bcm_delete_rx_op(struct list_head *ops, struct bcm_msg_head *mh,
>   						  bcm_rx_handler, op);
>   
>   			list_del(&op->list);
> +			synchronize_rcu();
>   			bcm_remove_op(op);
>   			return 1; /* done */
>   		}
> @@ -1533,6 +1534,11 @@ static int bcm_release(struct socket *sock)
>   					  REGMASK(op->can_id),
>   					  bcm_rx_handler, op);
>   
> +	}
> +
> +	synchronize_rcu();
> +
> +	list_for_each_entry_safe(op, next, &bo->rx_ops, list) {
>   		bcm_remove_op(op);
>   	}
>   
> 

  reply	other threads:[~2021-06-19 16:28 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-19 16:18 Thadeu Lima de Souza Cascardo
2021-06-19 16:25 ` Oliver Hartkopp [this message]
2021-06-19 20:12 ` Marc Kleine-Budde

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=685d97b7-3129-251f-9b44-03c636a44845@hartkopp.net \
    --to=socketcan@hartkopp.net \
    --cc=cascardo@canonical.com \
    --cc=davem@davemloft.net \
    --cc=kuba@kernel.org \
    --cc=linux-can@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mkl@pengutronix.de \
    --cc=netdev@vger.kernel.org \
    --cc=nslusarek@gmx.net \
    --cc=syzbot+0f7e7e5e2f4f40fa89c0@syzkaller.appspotmail.com \
    --subject='Re: [PATCH] can: bcm: delay release of struct bcm_op after synchronize_rcu' \
    /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

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).