From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
To: Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>
Cc: linux-kernel@vger.kernel.org,
Quentin Schulz <quentin.schulz@bootlin.com>,
"Gustavo A. R. Silva" <gustavo@embeddedor.com>,
devicetree@vger.kernel.org
Subject: [PATCH 1/2] dt-bindings: phy: Update SERDES_MAX to be SERDES_MAX + 1
Date: Tue, 9 Oct 2018 00:21:36 +0200 [thread overview]
Message-ID: <3a1a95a4832af33dcd1842b0298d257bbcf1f5ab.1539036280.git.gustavo@embeddedor.com> (raw)
In-Reply-To: <cover.1539036280.git.gustavo@embeddedor.com>
SERDES_MAX is a valid value to index ctrl->phys in
drivers/phy/mscc/phy-ocelot-serdes.c. But, currently,
there is an out-of-bounds bug in the mentioned driver
when reading from ctrl->phys, because the size of
array ctrl->phys is SERDES_MAX.
Partially fix this by updating SERDES_MAX to be SERDES6G_MAX + 1.
Notice that this is the first part of the solution to
the out-of-bounds bug mentioned above. Although this
change is not dependent on any other one.
Suggested-by: Quentin Schulz <quentin.schulz@bootlin.com>
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
include/dt-bindings/phy/phy-ocelot-serdes.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/dt-bindings/phy/phy-ocelot-serdes.h b/include/dt-bindings/phy/phy-ocelot-serdes.h
index bd28f21..fe70ada 100644
--- a/include/dt-bindings/phy/phy-ocelot-serdes.h
+++ b/include/dt-bindings/phy/phy-ocelot-serdes.h
@@ -7,6 +7,6 @@
#define SERDES1G_MAX SERDES1G(5)
#define SERDES6G(x) (SERDES1G_MAX + 1 + (x))
#define SERDES6G_MAX SERDES6G(2)
-#define SERDES_MAX SERDES6G_MAX
+#define SERDES_MAX (SERDES6G_MAX + 1)
#endif
--
2.7.4
next prev parent reply other threads:[~2018-10-08 22:21 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-08 22:20 [PATCH 0/2] phy: ocelot-serdes: fix out-of-bounds bug Gustavo A. R. Silva
2018-10-08 22:21 ` Gustavo A. R. Silva [this message]
2018-10-09 7:27 ` [PATCH 1/2] dt-bindings: phy: Update SERDES_MAX to be SERDES_MAX + 1 Quentin Schulz
2018-10-16 8:44 ` Gustavo A. R. Silva
2018-10-17 15:09 ` Rob Herring
2018-10-17 15:19 ` Gustavo A. R. Silva
2018-10-17 15:23 ` Rob Herring
2018-10-17 15:45 ` Gustavo A. R. Silva
2018-10-08 22:22 ` [PATCH 2/2] phy: ocelot-serdes: fix out-of-bounds read Gustavo A. R. Silva
2018-10-09 7:28 ` Quentin Schulz
2018-10-16 8:46 ` Gustavo A. R. Silva
2018-10-16 8:48 ` Kishon Vijay Abraham I
2018-10-17 15:37 ` Gustavo A. R. Silva
2018-11-12 8:27 ` Kishon Vijay Abraham I
2018-10-09 7:28 ` [PATCH 0/2] phy: ocelot-serdes: fix out-of-bounds bug Quentin Schulz
2018-10-09 14:13 ` Gustavo A. R. Silva
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=3a1a95a4832af33dcd1842b0298d257bbcf1f5ab.1539036280.git.gustavo@embeddedor.com \
--to=gustavo@embeddedor.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=quentin.schulz@bootlin.com \
--cc=robh+dt@kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).