All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marijn Suijten <marijn.suijten@somainline.org>
To: phone-devel@vger.kernel.org, Andy Gross <agross@kernel.org>,
	Bjorn Andersson <bjorn.andersson@linaro.org>,
	Rob Herring <robh+dt@kernel.org>,
	Lee Jones <lee.jones@linaro.org>,
	Daniel Thompson <daniel.thompson@linaro.org>,
	Jingoo Han <jingoohan1@gmail.com>
Cc: devicetree@vger.kernel.org, linux-fbdev@vger.kernel.org,
	Kiran Gunda <kgunda@codeaurora.org>,
	Pavel Dubrova <pashadubrova@gmail.com>,
	Jami Kettunen <jami.kettunen@somainline.org>,
	linux-arm-msm@vger.kernel.org, Bryan Wu <cooloney@gmail.com>,
	Konrad Dybcio <konrad.dybcio@somainline.org>,
	linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
	Martin Botka <martin.botka@somainline.org>,
	~postmarketos/upstreaming@lists.sr.ht,
	AngeloGioacchino Del Regno
	<angelogioacchino.delregno@somainline.org>,
	Marijn Suijten <marijn.suijten@somainline.org>
Subject: [PATCH v3 1/9] backlight: qcom-wled: Validate enabled string indices in DT
Date: Mon, 15 Nov 2021 21:34:51 +0100	[thread overview]
Message-ID: <20211115203459.1634079-2-marijn.suijten@somainline.org> (raw)
In-Reply-To: <20211115203459.1634079-1-marijn.suijten@somainline.org>

The strings passed in DT may possibly cause out-of-bounds register
accesses and should be validated before use.

Fixes: 775d2ffb4af6 ("backlight: qcom-wled: Restructure the driver for WLED3")
Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>
Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
---
 drivers/video/backlight/qcom-wled.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/drivers/video/backlight/qcom-wled.c b/drivers/video/backlight/qcom-wled.c
index d094299c2a48..8a42ed89c59c 100644
--- a/drivers/video/backlight/qcom-wled.c
+++ b/drivers/video/backlight/qcom-wled.c
@@ -1528,12 +1528,28 @@ static int wled_configure(struct wled *wled)
 	string_len = of_property_count_elems_of_size(dev->of_node,
 						     "qcom,enabled-strings",
 						     sizeof(u32));
-	if (string_len > 0)
+	if (string_len > 0) {
+		if (string_len > wled->max_string_count) {
+			dev_err(dev, "Cannot have more than %d strings\n",
+				wled->max_string_count);
+			return -EINVAL;
+		}
+
 		of_property_read_u32_array(dev->of_node,
 						"qcom,enabled-strings",
 						wled->cfg.enabled_strings,
 						sizeof(u32));
 
+		for (i = 0; i < string_len; ++i) {
+			if (wled->cfg.enabled_strings[i] >= wled->max_string_count) {
+				dev_err(dev,
+					"qcom,enabled-strings index %d at %d is out of bounds\n",
+					wled->cfg.enabled_strings[i], i);
+				return -EINVAL;
+			}
+		}
+	}
+
 	return 0;
 }
 
-- 
2.33.1


WARNING: multiple messages have this Message-ID (diff)
From: Marijn Suijten <marijn.suijten@somainline.org>
To: phone-devel@vger.kernel.org, Andy Gross <agross@kernel.org>,
	Bjorn Andersson <bjorn.andersson@linaro.org>,
	Rob Herring <robh+dt@kernel.org>,
	Lee Jones <lee.jones@linaro.org>,
	Daniel Thompson <daniel.thompson@linaro.org>,
	Jingoo Han <jingoohan1@gmail.com>
Cc: ~postmarketos/upstreaming@lists.sr.ht,
	AngeloGioacchino Del Regno 
	<angelogioacchino.delregno@somainline.org>,
	Konrad Dybcio <konrad.dybcio@somainline.org>,
	Martin Botka <martin.botka@somainline.org>,
	Jami Kettunen <jami.kettunen@somainline.org>,
	Pavel Dubrova <pashadubrova@gmail.com>,
	Marijn Suijten <marijn.suijten@somainline.org>,
	Kiran Gunda <kgunda@codeaurora.org>,
	Bryan Wu <cooloney@gmail.com>,
	linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
	linux-fbdev@vger.kernel.org
Subject: [PATCH v3 1/9] backlight: qcom-wled: Validate enabled string indices in DT
Date: Mon, 15 Nov 2021 21:34:51 +0100	[thread overview]
Message-ID: <20211115203459.1634079-2-marijn.suijten@somainline.org> (raw)
In-Reply-To: <20211115203459.1634079-1-marijn.suijten@somainline.org>

The strings passed in DT may possibly cause out-of-bounds register
accesses and should be validated before use.

Fixes: 775d2ffb4af6 ("backlight: qcom-wled: Restructure the driver for WLED3")
Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>
Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
---
 drivers/video/backlight/qcom-wled.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/drivers/video/backlight/qcom-wled.c b/drivers/video/backlight/qcom-wled.c
index d094299c2a48..8a42ed89c59c 100644
--- a/drivers/video/backlight/qcom-wled.c
+++ b/drivers/video/backlight/qcom-wled.c
@@ -1528,12 +1528,28 @@ static int wled_configure(struct wled *wled)
 	string_len = of_property_count_elems_of_size(dev->of_node,
 						     "qcom,enabled-strings",
 						     sizeof(u32));
-	if (string_len > 0)
+	if (string_len > 0) {
+		if (string_len > wled->max_string_count) {
+			dev_err(dev, "Cannot have more than %d strings\n",
+				wled->max_string_count);
+			return -EINVAL;
+		}
+
 		of_property_read_u32_array(dev->of_node,
 						"qcom,enabled-strings",
 						wled->cfg.enabled_strings,
 						sizeof(u32));
 
+		for (i = 0; i < string_len; ++i) {
+			if (wled->cfg.enabled_strings[i] >= wled->max_string_count) {
+				dev_err(dev,
+					"qcom,enabled-strings index %d at %d is out of bounds\n",
+					wled->cfg.enabled_strings[i], i);
+				return -EINVAL;
+			}
+		}
+	}
+
 	return 0;
 }
 
-- 
2.33.1


  reply	other threads:[~2021-11-15 20:35 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-15 20:34 [PATCH v3 0/9] backlight: qcom-wled: fix and solidify handling of enabled-strings Marijn Suijten
2021-11-15 20:34 ` Marijn Suijten
2021-11-15 20:34 ` Marijn Suijten [this message]
2021-11-15 20:34   ` [PATCH v3 1/9] backlight: qcom-wled: Validate enabled string indices in DT Marijn Suijten
2021-12-22 11:15   ` Lee Jones
2021-12-22 11:15     ` Lee Jones
2021-11-15 20:34 ` [PATCH v3 2/9] backlight: qcom-wled: Pass number of elements to read to read_u32_array Marijn Suijten
2021-11-15 20:34   ` Marijn Suijten
2021-12-22 11:15   ` Lee Jones
2021-12-22 11:15     ` Lee Jones
2021-11-15 20:34 ` [PATCH v3 3/9] backlight: qcom-wled: Use cpu_to_le16 macro to perform conversion Marijn Suijten
2021-11-15 20:34   ` Marijn Suijten
2021-11-16 11:56   ` Daniel Thompson
2021-11-16 11:56     ` Daniel Thompson
2021-12-22 11:16   ` Lee Jones
2021-12-22 11:16     ` Lee Jones
2021-11-15 20:34 ` [PATCH v3 4/9] backlight: qcom-wled: Fix off-by-one maximum with default num_strings Marijn Suijten
2021-11-15 20:34   ` Marijn Suijten
2021-11-16 11:58   ` Daniel Thompson
2021-11-16 11:58     ` Daniel Thompson
2021-12-22 11:16   ` Lee Jones
2021-12-22 11:16     ` Lee Jones
2021-11-15 20:34 ` [PATCH v3 5/9] backlight: qcom-wled: Override default length with qcom, enabled-strings Marijn Suijten
2021-11-15 20:34   ` [PATCH v3 5/9] backlight: qcom-wled: Override default length with qcom,enabled-strings Marijn Suijten
2021-11-16 11:59   ` Daniel Thompson
2021-11-16 11:59     ` Daniel Thompson
2021-12-22 11:17   ` Lee Jones
2021-12-22 11:17     ` Lee Jones
2021-11-15 20:34 ` [PATCH v3 6/9] backlight: qcom-wled: Remove unnecessary 4th default string in WLED3 Marijn Suijten
2021-11-15 20:34   ` Marijn Suijten
2021-12-22 11:17   ` Lee Jones
2021-12-22 11:17     ` Lee Jones
2021-11-15 20:34 ` [PATCH v3 7/9] backlight: qcom-wled: Provide enabled_strings default for WLED 4 and 5 Marijn Suijten
2021-11-15 20:34   ` Marijn Suijten
2021-12-22 11:18   ` Lee Jones
2021-12-22 11:18     ` Lee Jones
2021-11-15 20:34 ` [PATCH v3 8/9] backlight: qcom-wled: Remove unnecessary double whitespace Marijn Suijten
2021-11-15 20:34   ` Marijn Suijten
2021-12-22 11:18   ` Lee Jones
2021-12-22 11:18     ` Lee Jones
2021-11-15 20:34 ` [PATCH v3 9/9] backlight: qcom-wled: Respect enabled-strings in set_brightness Marijn Suijten
2021-11-15 20:34   ` Marijn Suijten
2021-12-22 11:18   ` Lee Jones
2021-12-22 11:18     ` Lee Jones
2021-11-16 12:02 ` [PATCH v3 0/9] backlight: qcom-wled: fix and solidify handling of enabled-strings Daniel Thompson
2021-11-16 12:02   ` Daniel Thompson
2021-11-16 15:42   ` Lee Jones
2021-11-16 15:42     ` Lee Jones
2021-12-21 23:31     ` Marijn Suijten
2021-12-21 23:31       ` Marijn Suijten
2021-12-22 10:56       ` Lee Jones

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:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

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

  git send-email \
    --in-reply-to=20211115203459.1634079-2-marijn.suijten@somainline.org \
    --to=marijn.suijten@somainline.org \
    --cc=agross@kernel.org \
    --cc=angelogioacchino.delregno@somainline.org \
    --cc=bjorn.andersson@linaro.org \
    --cc=cooloney@gmail.com \
    --cc=daniel.thompson@linaro.org \
    --cc=devicetree@vger.kernel.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=jami.kettunen@somainline.org \
    --cc=jingoohan1@gmail.com \
    --cc=kgunda@codeaurora.org \
    --cc=konrad.dybcio@somainline.org \
    --cc=lee.jones@linaro.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=martin.botka@somainline.org \
    --cc=pashadubrova@gmail.com \
    --cc=phone-devel@vger.kernel.org \
    --cc=robh+dt@kernel.org \
    --cc=~postmarketos/upstreaming@lists.sr.ht \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* 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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.