From patchwork Sat Mar 2 00:52:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 13579308 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9894F10F1 for ; Sat, 2 Mar 2024 00:52:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709340743; cv=none; b=mXo/HDy0JwCKa8iYFfMtbZQRHrHgyzJQQncTxrwg3k+c2tEp8P7gcyDrZ4iSUTVhMXAFvwG7Jd7uOQjKxmqmj8tZ7t4M5EKp7ZYmCcYGlUVIc5ZIgHE6EXRkDqS+ni+HWc+lq/ZYrnyoWPD9loxZAUjHdDR8D+xI4/C77EhtIBM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709340743; c=relaxed/simple; bh=i9zNt6rOlk75HZazBVwuQFbrGUUh1ujpF0qjhh1iKXA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IXZAgvtfWJh6KJb9dtLk16A1dW20ch+2lehJs8nRIePmSiOCJ/V9llMUzufZ11uvBMWmvlKhYSDZjXNkoQsp4QG04x0HpnC7OYvxdGHIcQ+FVYXyNEvZEJX95Wm/3b97XYomz8sY+31qYkBxSGIvfpWwvILWoCtJyXyUYtsm5ZQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=Ciwdgtcx; arc=none smtp.client-ip=209.85.128.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Ciwdgtcx" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-412bfacd146so13537005e9.0 for ; Fri, 01 Mar 2024 16:52:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709340740; x=1709945540; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=/abXWgtHmlIb9XxgX5gbRZA6M3LUdmvdJ04zpHwkRbw=; b=Ciwdgtcxa/fSIwfjDv5PEpnA12SP3Ng9piagaR7l7Ovt6t65i3JcZOvJqi/zFXd29D b71KOEy3u2LsjJFBCCJRlM8pH7oe6DSv3KW68ycHfPxaIenn2tq3MBfDGeefdR9SFfhx tw3QZtzDdma3CBg6Ucj8l3+a/H7jDXEABjR2BUZ2fsc+dNoZmO4+XsgPQNKobxKKh9ld 4NCIJfHOTrlvqKdTengK9/okDZjvdrSwhALXHhvgiZdYTVYK4ESkbh6VPxa91ufNVi/+ p1jQg6C9VVudSqxgOxZYa5ZTiTR2uTaeyFdA8/8PzZ47iqyy4G4vRZM1o2msMKo2eRyy kboQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709340740; x=1709945540; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/abXWgtHmlIb9XxgX5gbRZA6M3LUdmvdJ04zpHwkRbw=; b=BpV3hlbEbDoziQITHsP7Uxwah5+11SKAm0hB9tY7UEtgEffUfvUcpC6WoeAfr3zYAd mAuSsDBze8eGUgRIPFzWjtuEPxYDYOMWqAuCLBWx6PsqKn9tb2jKIfAPe1mBZwuvo4+l ikIuzw7LpJWv3+Dub00/KdGl6seumiUS+tXbL92Da0HYcd1aWH3lJQfj7JhgbXuE0zG/ /x02PDzu+zEIgk6qfDDyEurqGZhEgsO4Et76UBzDu35SKXmGKXIqs17AkWxK6HFOdj8I LsHCELGCdOvaWQAI58ssxC3HUXR7yWW4Onxy9vt3VRxWdyF2cB95dVEvfvDqutrzFc42 8qlg== X-Forwarded-Encrypted: i=1; AJvYcCVY5L8EqWKzLEmsnVSJyUmUWQgMDN4FpHejxbYKhEJQP6f+9xrqFmVn1FU67wkCulBdmL9gQmC+V4wkbgDgwn0jrzwP7ZYG1xheSDVnBg== X-Gm-Message-State: AOJu0Yw2b9dB0JCXwZbzYgW/dm80Zx7xXkt1byROCeQg3kOxVuySYHl9 XaAVbaTtPfHeGbRW1tq0o3bs9lDrCw4IlDFWPPq9m+KVAcTAIec8RZcYe921mgU= X-Google-Smtp-Source: AGHT+IFf6kIIxmFIowOq9kVezM+FJdAj6mvoHaDA7SDas70k/1wBH2ROYjcRSmBpd7FsWaBYTtjDew== X-Received: by 2002:a05:600c:4448:b0:412:b0d3:49d9 with SMTP id v8-20020a05600c444800b00412b0d349d9mr3246722wmn.9.1709340739907; Fri, 01 Mar 2024 16:52:19 -0800 (PST) Received: from [127.0.1.1] ([176.61.106.68]) by smtp.gmail.com with ESMTPSA id f15-20020adffccf000000b0033dedd63382sm5865501wrs.101.2024.03.01.16.52.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 16:52:19 -0800 (PST) From: Bryan O'Donoghue Date: Sat, 02 Mar 2024 00:52:14 +0000 Subject: [PATCH 1/2] clk: Fix clk_core_get NULL dereference Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240302-linux-next-24-03-01-simple-clock-fixes-v1-1-25f348a5982b@linaro.org> References: <20240302-linux-next-24-03-01-simple-clock-fixes-v1-0-25f348a5982b@linaro.org> In-Reply-To: <20240302-linux-next-24-03-01-simple-clock-fixes-v1-0-25f348a5982b@linaro.org> To: Michael Turquette , Stephen Boyd , Bjorn Andersson , Konrad Dybcio , Rajendra Nayak , Abel Vesa Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Bryan O'Donoghue X-Mailer: b4 0.14-dev It is possible for clk_core_get to dereference a NULL in the following sequence: clk_core_get() of_clk_get_hw_from_clkspec() __of_clk_get_hw_from_provider() __clk_get_hw() __clk_get_hw() can return NULL which is dereferenced by clk_core_get() at hw->core. Prior to commit dde4eff47c82 ("clk: Look for parents with clkdev based clk_lookups") the check IS_ERR_OR_NULL() was performed which would have caught the NULL. Reading the description of this function it talks about returning NULL but that cannot be so at the moment. Update the function to check for hw before dereferencing it and return NULL if hw is NULL. Fixes: dde4eff47c82 ("clk: Look for parents with clkdev based clk_lookups") Signed-off-by: Bryan O'Donoghue --- drivers/clk/clk.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index a3bc7fb90d0f..25371c91a58f 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -418,6 +418,9 @@ static struct clk_core *clk_core_get(struct clk_core *core, u8 p_index) if (IS_ERR(hw)) return ERR_CAST(hw); + if (!hw) + return NULL; + return hw->core; } From patchwork Sat Mar 2 00:52:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 13579309 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E985566A for ; Sat, 2 Mar 2024 00:52:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709340744; cv=none; b=ogFrC/CPLJw6iGswRYANTaOqqgR+ZW97PEjduRPKKdEQmsRvZuwmvAxhsyJeaA2Kb11kuvqpu0IbT2kKdKWKyhKKCNgWwUSUAqcBFsMPFQg/NeuiWQir0mL/iS6XwrgAMJFmprU5MLIJG9o3bkYPqL6MA9r7WITQNoqZqUmFitA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709340744; c=relaxed/simple; bh=5KcsPf2NXDTosjt6TxYIEZuVyoCBWIEzwcJCEsZMh14=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UroRhq/Yg2xpZ81++gYBz/MY96UbOaK/oWTE6XDSnlVOgveXTYjYg8QHEZO/MnXogSUbb+8fZgB/4Lo52VcI3Ux/Zj/8JgIsk3G5Ti6rRcBzn76u2fvleXCGXaStk0lNICkw4MW1CapavZ9lHM3ZjlVGfnHcCQWfjgimqeuByDs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=Fu/l1l89; arc=none smtp.client-ip=209.85.221.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Fu/l1l89" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-33d146737e6so1849177f8f.0 for ; Fri, 01 Mar 2024 16:52:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709340741; x=1709945541; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=epHJKobVDJjhahUPHFVdoDFlUlvBfNFMXFrew87gMLQ=; b=Fu/l1l89CnZlijJnxS0I4KyLWrlvc48EU0pgiB+X13fV3KBCnIiHe+68bx6qCFD7gx wUZj7GG7YO7pyTulu9Rh5ScpdcugSkvIRn8RriRs/2WkM0dVJcNVGJEZ6HeGPKvEabyW hQHuZCXIZMawyDQWuJ46GA7PkejCKCRZv22JdtyICgWtWWmMChSYsDfS4J2KybM8BZlw bvh6tHqbDZMyoHV2VLVyzLDqROGK3U2j9q/C41gJZCAV0lkVcMNKwduGK5wWaEWkV67C 0QwDlhAx2hW0pCV6uwFOOw7SvSmCYLotEffu00K6cfRBsMOvgJUiPZMfz3GU9+sJjWF7 X3Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709340741; x=1709945541; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=epHJKobVDJjhahUPHFVdoDFlUlvBfNFMXFrew87gMLQ=; b=ndNaVqq7rpfZSIL45ognpz2b1gz9+W7MmTCBxr+IcxS2YGWg9s4hOL0ehBhrqRR0LF v+1ButHEwpBeHQASoXUSyUhzJnNbyUKMRpg6ghTE+bESU0h6VHDm73Yi3/+ly2uCwRbe 7KEdizvrG1rqilQ+dbri7Up0e/umNu/NSqxqtsyG2dj0NpLaAsnwDh+MAw/LnppDusSw POSTwXTBXRMiNBSOcpg5Zy4x6mjDnMw5NCkv3DnyxAR4KRXBDmFWfbpje+/s9p4iHc9r IG/Bgz+zO0S3mVznTqG8GUdTDtuQDQXmkBJsVB6mzZesgeke5Li183bIvJPX1am89t4q +AdQ== X-Forwarded-Encrypted: i=1; AJvYcCUf071G/7Uj7gTirNgFv5rPPoxXSPO63EB9L0tsR3/Y6n8zqFmew4qXwHQ9r/hPvnsU9t3OCRuEgmEUL4+wz78rFn9A644YNDR/4DrT3g== X-Gm-Message-State: AOJu0YyVz98Aq5phKyLi+ByekycSGaH06CwCv9gxnmpuCX818/pFhegt OM9aTzHbHtNV4G7x9iavAnAPppfJFwereaOBhJuGo4ktxYSAdP2OkWWlDj0dj7I= X-Google-Smtp-Source: AGHT+IEZB89IozKw4cjqKVIKyH5c1bwWK8g37ziiO6UL1ZXHdGBpR5lru1AtvgB13K9uvzoUE1Co6g== X-Received: by 2002:adf:db50:0:b0:33d:afbc:6c85 with SMTP id f16-20020adfdb50000000b0033dafbc6c85mr2953106wrj.8.1709340741649; Fri, 01 Mar 2024 16:52:21 -0800 (PST) Received: from [127.0.1.1] ([176.61.106.68]) by smtp.gmail.com with ESMTPSA id f15-20020adffccf000000b0033dedd63382sm5865501wrs.101.2024.03.01.16.52.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 16:52:20 -0800 (PST) From: Bryan O'Donoghue Date: Sat, 02 Mar 2024 00:52:15 +0000 Subject: [PATCH 2/2] clk: qcom: camcc-x1e80100: Fix missing DT_IFACE enum in x1e80100 camcc Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240302-linux-next-24-03-01-simple-clock-fixes-v1-2-25f348a5982b@linaro.org> References: <20240302-linux-next-24-03-01-simple-clock-fixes-v1-0-25f348a5982b@linaro.org> In-Reply-To: <20240302-linux-next-24-03-01-simple-clock-fixes-v1-0-25f348a5982b@linaro.org> To: Michael Turquette , Stephen Boyd , Bjorn Andersson , Konrad Dybcio , Rajendra Nayak , Abel Vesa Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Bryan O'Donoghue X-Mailer: b4 0.14-dev The desired DT pattern for clock indexing is the following: clocks = <&gcc GCC_CAMERA_AHB_CLK>, <&bi_tcxo_div2>, <&bi_tcxo_ao_div2>, <&sleep_clk>; In order to facilitate that indexing structure we need to have DT_IFACE enum defined. Fixes: 76126a5129b5 ("clk: qcom: Add camcc clock driver for x1e80100") Signed-off-by: Bryan O'Donoghue Reviewed-by: Konrad Dybcio --- drivers/clk/qcom/camcc-x1e80100.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/clk/qcom/camcc-x1e80100.c b/drivers/clk/qcom/camcc-x1e80100.c index f7f3d92c263d..46bb225906bf 100644 --- a/drivers/clk/qcom/camcc-x1e80100.c +++ b/drivers/clk/qcom/camcc-x1e80100.c @@ -21,6 +21,7 @@ #include "reset.h" enum { + DT_IFACE, DT_BI_TCXO, DT_BI_TCXO_AO, DT_SLEEP_CLK,