From: "Thomas Weißschuh" <thomas.weissschuh@linutronix.de>
To: Rob Herring <robh@kernel.org>, Saravana Kannan <saravanak@google.com>
Cc: "Basharath Hussain Khaja" <basharath@couthit.com>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
"Thomas Weißschuh" <thomas.weissschuh@linutronix.de>,
stable@vger.kernel.org
Subject: [PATCH 1/2] of: address: Fix empty resource handling in __of_address_resource_bounds()
Date: Mon, 20 Jan 2025 15:09:40 +0100 [thread overview]
Message-ID: <20250120-of-address-overflow-v1-1-dd68dbf47bce@linutronix.de> (raw)
In-Reply-To: <20250120-of-address-overflow-v1-0-dd68dbf47bce@linutronix.de>
"resource->end" needs to always be equal to "resource->start + size - 1".
The previous version of the function did not perform the "- 1" in case
of an empty resource.
Also make sure to allow an empty resource at address 0.
Reported-by: Basharath Hussain Khaja <basharath@couthit.com>
Closes: https://lore.kernel.org/lkml/20250108140414.13530-1-basharath@couthit.com/
Fixes: 1a52a094c2f0 ("of: address: Unify resource bounds overflow checking")
Cc: stable@vger.kernel.org
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
drivers/of/address.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/of/address.c b/drivers/of/address.c
index 8770004d9b085f1ff40f693d695d284a6ef3dfde..5c0663066a7f3816a05077f99124ca25e3c152d7 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -200,17 +200,15 @@ static u64 of_bus_pci_map(__be32 *addr, const __be32 *range, int na, int ns,
static int __of_address_resource_bounds(struct resource *r, u64 start, u64 size)
{
- u64 end = start;
-
if (overflows_type(start, r->start))
return -EOVERFLOW;
- if (size && check_add_overflow(end, size - 1, &end))
- return -EOVERFLOW;
- if (overflows_type(end, r->end))
- return -EOVERFLOW;
r->start = start;
- r->end = end;
+
+ if (!size)
+ r->end = wrapping_sub(typeof(r->end), r->start, 1);
+ else if (size && check_add_overflow(r->start, size - 1, &r->end))
+ return -EOVERFLOW;
return 0;
}
--
2.48.1
next prev parent reply other threads:[~2025-01-20 14:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-20 14:09 [PATCH 0/2] of: address: Fix empty resource handling in __of_address_resource_bounds() Thomas Weißschuh
2025-01-20 14:09 ` Thomas Weißschuh [this message]
2025-01-24 22:00 ` [PATCH 1/2] " Rob Herring (Arm)
2025-01-20 14:09 ` [PATCH 2/2] of: address: Add kunit test for __of_address_resource_bounds() Thomas Weißschuh
2025-01-20 19:31 ` kernel test robot
2025-01-21 1:57 ` kernel test robot
2025-01-26 9:59 ` kernel test robot
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=20250120-of-address-overflow-v1-1-dd68dbf47bce@linutronix.de \
--to=thomas.weissschuh@linutronix.de \
--cc=basharath@couthit.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh@kernel.org \
--cc=saravanak@google.com \
--cc=stable@vger.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).