On Mon, Jan 31, 2022 at 11:56:50AM +0100, Greg Kroah-Hartman wrote:
> From: Toke Høiland-Jørgensen <toke@xxxxxxxxxx>
>
> [ Upstream commit c63003e3d99761afb280add3b30de1cf30fa522b ]
>
> The cpsw driver didn't properly initialise the struct page_pool_params
> before calling page_pool_create(), which leads to crashes after the struct
> has been expanded with new parameters.
>
> The second Fixes tag below is where the buggy code was introduced, but
> because the code was moved around this patch will only apply on top of the
> commit in the first Fixes tag.
>
> Fixes: c5013ac1dd0e ("net: ethernet: ti: cpsw: move set of common functions in cpsw_priv")
> Fixes: 9ed4050c0d75 ("net: ethernet: ti: cpsw: add XDP support")
In 5.4 every parameter is individually initialized, so there really
isn't a "bug" necessarily. Only at commit e68bc75691cc does it actually
start not initializing every parameter.
https://elixir.bootlin.com/linux/v5.4.175/source/drivers/net/ethernet/ti/cpsw.c#L558
I'm not familiar with the process of backporting fixes to stable yet. Is
there any benefit in this cleanup for 5.4 or is it fine to leave it?
> Reported-by: Colin Foster <colin.foster@xxxxxxxxxxxxxxxx>
> Signed-off-by: Toke Høiland-Jørgensen <toke@xxxxxxxxxx>
> Tested-by: Colin Foster <colin.foster@xxxxxxxxxxxxxxxx>
> Acked-by: Jesper Dangaard Brouer <brouer@xxxxxxxxxx>
> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
> ---
> drivers/net/ethernet/ti/cpsw_priv.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/ti/cpsw_priv.c b/drivers/net/ethernet/ti/cpsw_priv.c
> index 424e644724e46..e74f2e95a46eb 100644
> --- a/drivers/net/ethernet/ti/cpsw_priv.c
> +++ b/drivers/net/ethernet/ti/cpsw_priv.c
> @@ -1144,7 +1144,7 @@ int cpsw_fill_rx_channels(struct cpsw_priv *priv)
> static struct page_pool *cpsw_create_page_pool(struct cpsw_common *cpsw,
> int size)
> {
> - struct page_pool_params pp_params;
> + struct page_pool_params pp_params = {};
> struct page_pool *pool;
>
> pp_params.order = 0;
> --
> 2.34.1
>
>
>
