Received-SPF: pass (google.com: domain of linux-kernel+bounces-95553-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Message-ID: <2d70513e9f84e650ef1ede5a8ae5960a9de782bc.camel@huaweicloud.com>
Subject: Re: [PATCH] um: Add winch to winch_handlers before registering
 winch IRQ
From: Roberto Sassu <roberto.sassu@huaweicloud.com>
To: richard@nod.at, anton.ivanov@cambridgegreys.com,
 johannes@sipsolutions.net
Cc: linux-kernel@vger.kernel.org, linux-um@lists.infradead.org, Roberto
 Sassu <roberto.sassu@huawei.com>
Date: Thu, 07 Mar 2024 13:43:40 +0100
In-Reply-To: <20240307104926.3531358-1-roberto.sassu@huaweicloud.com>
References: <20240307104926.3531358-1-roberto.sassu@huaweicloud.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.44.4-0ubuntu2 
Precedence: bulk
MIME-Version: 1.0

On Thu, 2024-03-07 at 11:49 +0100, Roberto Sassu wrote:
> From: Roberto Sassu <roberto.sassu@huawei.com>
>=20
> Registering a winch IRQ is racy, an interrupt may occur before the winch =
is
> added to the winch_handlers list.
>=20
> If that happens, register_winch_irq() adds to that list a winch that is
> scheduled to be (or has already been) freed, causing a panic later in
> winch_cleanup().
>=20
> Avoid the race by adding the winch to the winch_handlers list before
> registering the IRQ, and rolling back if um_request_irq() fails.
>=20
> Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>

Fixes: 42a359e31a0e ("uml: SIGIO support cleanup")

I see that before that commit there was the same ordering (list_add()
before um_request_irq()).

Failure from um_request_irq() should not result in executing
winch_interrupt() which could call list_del() itself. Then, it should
be fine to delete the winch in the error path.

Roberto

> ---
>  arch/um/drivers/line.c | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
>=20
> diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
> index ffc5cb92fa36..d82bc3fdb86e 100644
> --- a/arch/um/drivers/line.c
> +++ b/arch/um/drivers/line.c
> @@ -676,24 +676,26 @@ void register_winch_irq(int fd, int tty_fd, int pid=
, struct tty_port *port,
>  		goto cleanup;
>  	}
> =20
> -	*winch =3D ((struct winch) { .list  	=3D LIST_HEAD_INIT(winch->list),
> -				   .fd  	=3D fd,
> +	*winch =3D ((struct winch) { .fd  	=3D fd,
>  				   .tty_fd 	=3D tty_fd,
>  				   .pid  	=3D pid,
>  				   .port 	=3D port,
>  				   .stack	=3D stack });
> =20
> +	spin_lock(&winch_handler_lock);
> +	list_add(&winch->list, &winch_handlers);
> +	spin_unlock(&winch_handler_lock);
> +
>  	if (um_request_irq(WINCH_IRQ, fd, IRQ_READ, winch_interrupt,
>  			   IRQF_SHARED, "winch", winch) < 0) {
>  		printk(KERN_ERR "register_winch_irq - failed to register "
>  		       "IRQ\n");
> +		spin_lock(&winch_handler_lock);
> +		list_del(&winch->list);
> +		spin_unlock(&winch_handler_lock);
>  		goto out_free;
>  	}
> =20
> -	spin_lock(&winch_handler_lock);
> -	list_add(&winch->list, &winch_handlers);
> -	spin_unlock(&winch_handler_lock);
> -
>  	return;
> =20
>   out_free: