Re: [PATCH 171/190] Revert "net: stmicro: fix a missing check of clk_prepare"

Greg Kroah-Hartman
2021-04-27T18:07:15Z

On Wed, Apr 21, 2021 at 03:00:46PM +0200, Greg Kroah-Hartman wrote:
> This reverts commit f86a3b83833e7cfe558ca4d70b64ebc48903efec.
>
> Commits from @umn.edu addresses have been found to be submitted in "bad
> faith" to try to test the kernel community's ability to review "known
> malicious" changes. The result of these submissions can be found in a
> paper published at the 42nd IEEE Symposium on Security and Privacy
> entitled, "Open Source Insecurity: Stealthily Introducing
> Vulnerabilities via Hypocrite Commits" written by Qiushi Wu (University
> of Minnesota) and Kangjie Lu (University of Minnesota).
>
> Because of this, all submissions from this group must be reverted from
> the kernel tree and will need to be re-reviewed again to determine if
> they actually are a valid fix. Until that work is complete, remove this
> change to ensure that no problems are being introduced into the
> codebase.
>
> Cc: Kangjie Lu <kjlu@umn.edu>
> Cc: David S. Miller <davem@davemloft.net>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
> drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c
> index 0e1ca2cba3c7..0e86553fc06f 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c
> @@ -50,9 +50,7 @@ static int sun7i_gmac_init(struct platform_device *pdev, void *priv)
> gmac->clk_enabled = 1;
> } else {
> clk_set_rate(gmac->tx_clk, SUN7I_GMAC_MII_RATE);
> - ret = clk_prepare(gmac->tx_clk);
> - if (ret)
> - return ret;
> + clk_prepare(gmac->tx_clk);
> }
>
> return 0;
> --
> 2.31.1
>

The original commit here can cause a memory leak so I will keep this
revert and submit a change that fixes this up properly.

thanks,

greg k-h