Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 29 Jun 2022 11:01:11 +0300 (EEST)
From:   =?ISO-8859-15?Q?Ilpo_J=E4rvinen?= <ilpo.jarvinen@linux.intel.com>
To:     Jeremy Linton <jeremy.linton@arm.com>
cc:     linux-serial <linux-serial@vger.kernel.org>,
        Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Jiri Slaby <jirislaby@kernel.org>, miquel.raynal@bootlin.com,
        phil.edworthy@renesas.com, kernel@esmil.dk,
        LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 2/2] serial: 8250: dw: Fix NULL pointer dereference
In-Reply-To: <20220629000232.3440704-3-jeremy.linton@arm.com>
Message-ID: <f70f0a6-1023-6833-fe6c-e82ca8e418d3@linux.intel.com>
References: <20220629000232.3440704-1-jeremy.linton@arm.com> <20220629000232.3440704-3-jeremy.linton@arm.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Precedence: bulk

Hi,

Does cd16044d7c38 ("serial: 8250: dw: enable using pdata with ACPI") work 
for you? (Currently in tty-linus branch).

-- 
 i.


On Tue, 28 Jun 2022, Jeremy Linton wrote:

> Similarly to e6a08c6949cb, ACPI machines don't have
> a pdata setup, leading to a null pointer dereference
> when dw8250_handle_irq runs.
> 
> Fixes: aa63d786cea2 ("serial: 8250: dw: Add support for DMA flow controlling devices")
> Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
> ---
>  drivers/tty/serial/8250/8250_dw.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
> index 53e488beb8c2..06f80090cbb9 100644
> --- a/drivers/tty/serial/8250/8250_dw.c
> +++ b/drivers/tty/serial/8250/8250_dw.c
> @@ -237,10 +237,13 @@ static int dw8250_handle_irq(struct uart_port *p)
>  	struct dw8250_data *d = to_dw8250_data(p->private_data);
>  	unsigned int iir = p->serial_in(p, UART_IIR);
>  	bool rx_timeout = (iir & 0x3f) == UART_IIR_RX_TIMEOUT;
> -	unsigned int quirks = d->pdata->quirks;
> +	unsigned int quirks = 0;
>  	unsigned int status;
>  	unsigned long flags;
>  
> +	if (d->pdata)
> +		quirks = d->pdata->quirks;
> +
>  	/*
>  	 * There are ways to get Designware-based UARTs into a state where
>  	 * they are asserting UART_IIR_RX_TIMEOUT but there is no actual
>