nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 09:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

watchdog: Fix overflow error

Browse Source 
Fixed unsigned int overflow error.

Bug 5083375

Change-Id: If8ddb802938e9ef811462a99023830e3370a00ab
Signed-off-by: Mallikarjun Kasoju <mkasoju@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3296593
Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
Reviewed-by: svcacv <svcacv@nvidia.com>
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Mallikarjun Kasoju
2025-02-05 06:31:10 +00:00
committed by Jon Hunter
parent 090b44a9f1
commit 14d6946415
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/watchdog/watchdog-tegra-t18x.c
View File

@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
// SPDX-FileCopyrightText: Copyright (c) 2023-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. // SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
#include <nvidia/conftest.h> #include <nvidia/conftest.h>
@@ -444,6 +444,7 @@ static int tegra_wdt_t18x_probe(struct platform_device *pdev)
u32 pval = 0; u32 pval = 0;
u32 error_threshold; u32 error_threshold;
int ret; int ret;
resource_size_t tmp_u64;
twdt_t18x = devm_kzalloc(&pdev->dev, sizeof(*twdt_t18x), GFP_KERNEL); twdt_t18x = devm_kzalloc(&pdev->dev, sizeof(*twdt_t18x), GFP_KERNEL);
if (!twdt_t18x) if (!twdt_t18x)
@@ -544,8 +545,14 @@ static int tegra_wdt_t18x_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
/* Check for overflow */
if (check_add_overflow(res_wdt->start, (resource_size_t)(pval * 0x1000), &tmp_u64)) {
dev_err(dev, "Adjust address for WDT exceeded\n");
return -EINVAL;
}
/* Adjust address for WDT */ /* Adjust address for WDT */
ret = adjust_resource(res_wdt, res_wdt->start + pval * 0x1000, ret = adjust_resource(res_wdt, tmp_u64,
res_wdt->end - res_wdt->start); res_wdt->end - res_wdt->start);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "Cannot adjust address of WDT: %d\n", ret); dev_err(dev, "Cannot adjust address of WDT: %d\n", ret);