lkml.org 
[lkml]   [2022]   [Jan]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 148/171] net: cpsw: Properly initialise struct page_pool_params
    Date
    From: Toke Høiland-Jørgensen <toke@redhat.com>

    [ 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")
    Reported-by: Colin Foster <colin.foster@in-advantage.com>
    Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
    Tested-by: Colin Foster <colin.foster@in-advantage.com>
    Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 6bb5ac51d23c3..f8e591d69d2cb 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


    \
     
     \ /
      Last update: 2022-01-31 12:40    [W:4.088 / U:0.404 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site