mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <>
Cc: Ahmad Fatoum <>
Subject: [PATCH master 1/2] clk: harden NULL handling in clk_hw_to_clk/clk_to_clk_hw
Date: Mon,  7 Mar 2022 18:01:05 +0100	[thread overview]
Message-ID: <> (raw)

As clk_hw::clk is the first member and there may no be leading padding,
clk_hw_to_clk(NULL) == clk_to_clk_hw(NULL) == NULL. This would break if
we moved struct clk around, so make this more robust by using
IS_ERR_OR_NULL. No functional change.

Signed-off-by: Ahmad Fatoum <>
 include/linux/clk.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/linux/clk.h b/include/linux/clk.h
index c0e998e54ae6..7fd835c35e51 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -433,12 +433,14 @@ struct clk_hw {
 static inline struct clk *clk_hw_to_clk(const struct clk_hw *hw)
-	return IS_ERR(hw) ? ERR_CAST(hw) : (struct clk *)&hw->clk;
+	return IS_ERR_OR_NULL(hw) ? ERR_CAST(hw)
+				  : (struct clk *)&hw->clk;
 static inline struct clk_hw *clk_to_clk_hw(const struct clk *clk)
-	return IS_ERR(clk) ? ERR_CAST(clk) : (struct clk_hw *)container_of(clk, struct clk_hw, clk);
+	return IS_ERR_OR_NULL(clk) ? ERR_CAST(clk)
+				   : (struct clk_hw *)container_of(clk, struct clk_hw, clk);
 struct clk_div_table {

barebox mailing list

             reply	other threads:[~2022-03-07 17:03 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-07 17:01 Ahmad Fatoum [this message]
2022-03-07 17:01 ` [PATCH master 2/2] clk: composite: fix possible NULL pointer dereference Ahmad Fatoum
2022-03-08  8:19 ` [PATCH master 1/2] clk: harden NULL handling in clk_hw_to_clk/clk_to_clk_hw Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox