linux-kernel - [PATCH] memory: omap-gpmc: fix wait pin validation

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Fri, 9 Dec 2022 13:31:47 +0100
From:   "B. Niedermayr" <benedikt.niedermayr@...mens.com>
To:     <linux-next@...r.kernel.org>, Roger Quadros <rogerq@...nel.org>,
        "Tony Lindgren" <tony@...mide.com>,
        Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>,
        Benedikt Niedermayr <benedikt.niedermayr@...mens.com>
CC:     Rob Herring <robh+dt@...nel.org>,
        "open list:OMAP GENERAL PURPOSE MEMORY CONTROLLER SUPPORT" 
        <linux-omap@...r.kernel.org>,
        "open list:MEMORY CONTROLLER DRIVERS" <linux-kernel@...r.kernel.org>
Subject: [PATCH] memory: omap-gpmc: fix wait pin validation

From: Benedikt Niedermayr <benedikt.niedermayr@...mens.com>

This bug has been introduced after switching from -1 to UINT_MAX
for GPMC_WAITPIN_INVALID.

The bug leads to an error when the optional gpmc,wait-pin
dt-property is not used:

...
gpmc_cs_program_settings: invalid wait-pin (-1)
...

Signed-off-by: Benedikt Niedermayr <benedikt.niedermayr@...mens.com>
Fixes: 8dd7e4af5853 ("memory: omap-gpmc: fix coverity issue "Control flow issues"")
Cc: Rob Herring <robh+dt@...nel.org>
---
 drivers/memory/omap-gpmc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index 57d9f91fe89b..d78f73db37c8 100644
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -1918,7 +1918,8 @@ int gpmc_cs_program_settings(int cs, struct gpmc_settings *p)
 		}
 	}
 
-	if (p->wait_pin > gpmc_nr_waitpins) {
+	if (p->wait_pin != GPMC_WAITPIN_INVALID &&
+	    p->wait_pin > gpmc_nr_waitpins) {
 		pr_err("%s: invalid wait-pin (%d)\n", __func__, p->wait_pin);
 		return -EINVAL;
 	}
-- 
2.25.1