[v3] MIPS: BCM63xx: Add check for NULL for clk in clk_enable

Message ID 20221209100550.30470-1-abelova@astralinux.ru
State New
Headers
Series [v3] MIPS: BCM63xx: Add check for NULL for clk in clk_enable |

Commit Message

Anastasia Belova Dec. 9, 2022, 10:05 a.m. UTC
  Check clk for NULL before calling clk_enable_unlocked where clk
is dereferenced. There is such check in other implementations
of clk_enable.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: e7300d04bd08 ("MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs.")
Signed-off-by: Anastasia Belova <abelova@astralinux.ru>
---
v2: Fix errors reported by kernel test robot <lkp@intel.com>.
v3: Merge several patches into single one.
 arch/mips/bcm63xx/clk.c | 2 ++
 1 file changed, 2 insertions(+)
  

Comments

Philippe Mathieu-Daudé Dec. 9, 2022, 4:39 p.m. UTC | #1
On 9/12/22 11:05, Anastasia Belova wrote:
> Check clk for NULL before calling clk_enable_unlocked where clk
> is dereferenced. There is such check in other implementations
> of clk_enable.
> 
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
> 
> Fixes: e7300d04bd08 ("MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs.")
> Signed-off-by: Anastasia Belova <abelova@astralinux.ru>
> ---
> v2: Fix errors reported by kernel test robot <lkp@intel.com>.
> v3: Merge several patches into single one.
>   arch/mips/bcm63xx/clk.c | 2 ++
>   1 file changed, 2 insertions(+)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
  
Florian Fainelli Dec. 9, 2022, 5:07 p.m. UTC | #2
On 12/9/22 02:05, Anastasia Belova wrote:
> Check clk for NULL before calling clk_enable_unlocked where clk
> is dereferenced. There is such check in other implementations
> of clk_enable.
> 
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
> 
> Fixes: e7300d04bd08 ("MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs.")
> Signed-off-by: Anastasia Belova <abelova@astralinux.ru>

Acked-by: Florian Fainelli <f.fainelli@gmail.com>
  
Thomas Bogendoerfer Dec. 9, 2022, 10:41 p.m. UTC | #3
On Fri, Dec 09, 2022 at 01:05:50PM +0300, Anastasia Belova wrote:
> Check clk for NULL before calling clk_enable_unlocked where clk
> is dereferenced. There is such check in other implementations
> of clk_enable.
> 
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
> 
> Fixes: e7300d04bd08 ("MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs.")
> Signed-off-by: Anastasia Belova <abelova@astralinux.ru>
> ---
> v2: Fix errors reported by kernel test robot <lkp@intel.com>.
> v3: Merge several patches into single one.
>  arch/mips/bcm63xx/clk.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/mips/bcm63xx/clk.c b/arch/mips/bcm63xx/clk.c
> index 6e6756e8fa0a..86a6e2590866 100644
> --- a/arch/mips/bcm63xx/clk.c
> +++ b/arch/mips/bcm63xx/clk.c
> @@ -361,6 +361,8 @@ static struct clk clk_periph = {
>   */
>  int clk_enable(struct clk *clk)
>  {
> +	if (!clk)
> +		return 0;
>  	mutex_lock(&clocks_mutex);
>  	clk_enable_unlocked(clk);
>  	mutex_unlock(&clocks_mutex);
> -- 
> 2.30.2

applied to mips-next.

Thomas.
  

Patch

diff --git a/arch/mips/bcm63xx/clk.c b/arch/mips/bcm63xx/clk.c
index 6e6756e8fa0a..86a6e2590866 100644
--- a/arch/mips/bcm63xx/clk.c
+++ b/arch/mips/bcm63xx/clk.c
@@ -361,6 +361,8 @@  static struct clk clk_periph = {
  */
 int clk_enable(struct clk *clk)
 {
+	if (!clk)
+		return 0;
 	mutex_lock(&clocks_mutex);
 	clk_enable_unlocked(clk);
 	mutex_unlock(&clocks_mutex);