From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63517C46467 for ; Mon, 16 Jan 2023 17:26:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234739AbjAPR0Q (ORCPT ); Mon, 16 Jan 2023 12:26:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234651AbjAPRZx (ORCPT ); Mon, 16 Jan 2023 12:25:53 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8047D39B9B for ; Mon, 16 Jan 2023 09:03:01 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0593D61083 for ; Mon, 16 Jan 2023 17:03:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 15EC4C433D2; Mon, 16 Jan 2023 17:02:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1673888580; bh=AGZnvZ4MiAc7KYFSmoE1wxmVSfSePJMm2aBS/xWRNsQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YyudExqAEFyuLWH4gZtlpLNbAIhv+nDqJQPNfG9iyGW7TAfSSJ8UcYStzFL5Zkk/O 4FHHOk+V66LgfTjmlQqZWfEO4d4pU3xtv7Ns6jeY0MvRxr+jrW+qK61CYAF7eAFBIx ycYO6mOD0kd57pepybALWk4fR7JV0NxPdy3K1CX8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Anastasia Belova , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Florian Fainelli , Thomas Bogendoerfer , Sasha Levin Subject: [PATCH 4.14 060/338] MIPS: BCM63xx: Add check for NULL for clk in clk_enable Date: Mon, 16 Jan 2023 16:48:53 +0100 Message-Id: <20230116154823.428954165@linuxfoundation.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116154820.689115727@linuxfoundation.org> References: <20230116154820.689115727@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Anastasia Belova [ Upstream commit ee9ef11bd2a59c2fefaa0959e5efcdf040d7c654 ] 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 Reviewed-by: Philippe Mathieu-Daudé Acked-by: Florian Fainelli Signed-off-by: Thomas Bogendoerfer Signed-off-by: Sasha Levin --- 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 73f2534b9676..2f4b5978433d 100644 --- a/arch/mips/bcm63xx/clk.c +++ b/arch/mips/bcm63xx/clk.c @@ -317,6 +317,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.35.1