lkml.org 
[lkml]   [2019]   [Aug]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 27/56] net: phy: mscc: initialize stats array
    Date
    From: Andreas Schwab <schwab@suse.de>

    [ Upstream commit f972037e71246c5e0916eef835174d58ffc517e4 ]

    The memory allocated for the stats array may contain arbitrary data.

    Fixes: e4f9ba642f0b ("net: phy: mscc: add support for VSC8514 PHY.")
    Fixes: 00d70d8e0e78 ("net: phy: mscc: add support for VSC8574 PHY")
    Fixes: a5afc1678044 ("net: phy: mscc: add support for VSC8584 PHY")
    Fixes: f76178dc5218 ("net: phy: mscc: add ethtool statistics counters")
    Signed-off-by: Andreas Schwab <schwab@suse.de>
    Reviewed-by: Andrew Lunn <andrew@lunn.ch>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/phy/mscc.c | 16 ++++++++--------
    1 file changed, 8 insertions(+), 8 deletions(-)

    --- a/drivers/net/phy/mscc.c
    +++ b/drivers/net/phy/mscc.c
    @@ -2226,8 +2226,8 @@ static int vsc8514_probe(struct phy_devi
    vsc8531->supp_led_modes = VSC85XX_SUPP_LED_MODES;
    vsc8531->hw_stats = vsc85xx_hw_stats;
    vsc8531->nstats = ARRAY_SIZE(vsc85xx_hw_stats);
    - vsc8531->stats = devm_kmalloc_array(&phydev->mdio.dev, vsc8531->nstats,
    - sizeof(u64), GFP_KERNEL);
    + vsc8531->stats = devm_kcalloc(&phydev->mdio.dev, vsc8531->nstats,
    + sizeof(u64), GFP_KERNEL);
    if (!vsc8531->stats)
    return -ENOMEM;

    @@ -2251,8 +2251,8 @@ static int vsc8574_probe(struct phy_devi
    vsc8531->supp_led_modes = VSC8584_SUPP_LED_MODES;
    vsc8531->hw_stats = vsc8584_hw_stats;
    vsc8531->nstats = ARRAY_SIZE(vsc8584_hw_stats);
    - vsc8531->stats = devm_kmalloc_array(&phydev->mdio.dev, vsc8531->nstats,
    - sizeof(u64), GFP_KERNEL);
    + vsc8531->stats = devm_kcalloc(&phydev->mdio.dev, vsc8531->nstats,
    + sizeof(u64), GFP_KERNEL);
    if (!vsc8531->stats)
    return -ENOMEM;

    @@ -2281,8 +2281,8 @@ static int vsc8584_probe(struct phy_devi
    vsc8531->supp_led_modes = VSC8584_SUPP_LED_MODES;
    vsc8531->hw_stats = vsc8584_hw_stats;
    vsc8531->nstats = ARRAY_SIZE(vsc8584_hw_stats);
    - vsc8531->stats = devm_kmalloc_array(&phydev->mdio.dev, vsc8531->nstats,
    - sizeof(u64), GFP_KERNEL);
    + vsc8531->stats = devm_kcalloc(&phydev->mdio.dev, vsc8531->nstats,
    + sizeof(u64), GFP_KERNEL);
    if (!vsc8531->stats)
    return -ENOMEM;

    @@ -2311,8 +2311,8 @@ static int vsc85xx_probe(struct phy_devi
    vsc8531->supp_led_modes = VSC85XX_SUPP_LED_MODES;
    vsc8531->hw_stats = vsc85xx_hw_stats;
    vsc8531->nstats = ARRAY_SIZE(vsc85xx_hw_stats);
    - vsc8531->stats = devm_kmalloc_array(&phydev->mdio.dev, vsc8531->nstats,
    - sizeof(u64), GFP_KERNEL);
    + vsc8531->stats = devm_kcalloc(&phydev->mdio.dev, vsc8531->nstats,
    + sizeof(u64), GFP_KERNEL);
    if (!vsc8531->stats)
    return -ENOMEM;


    \
     
     \ /
      Last update: 2019-08-08 21:26    [W:3.185 / U:1.364 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site