]> www.infradead.org Git - users/dwmw2/qemu.git/commitdiff
hw/block/pflash_cfi01: Don't decrement pfl->counter below 0
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 31 Jul 2024 14:36:13 +0000 (15:36 +0100)
committerPhilippe Mathieu-Daudé <philmd@linaro.org>
Tue, 6 Aug 2024 08:22:52 +0000 (10:22 +0200)
In pflash_write() Coverity points out that we can decrement the
unsigned pfl->counter below zero, which makes it wrap around.  In
fact this is harmless, because if pfl->counter is 0 at this point we
also increment pfl->wcycle to 3, and the wcycle == 3 handling doesn't
look at counter; the only way back into code which looks at the
counter value is via wcycle == 1, which will reinitialize the counter.
But it's arguably a little clearer to break early in the "counter ==
0" if(), to avoid the decrement-below-zero.

Resolves: Coverity CID 1547611
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20240731143617.3391947-4-peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
hw/block/pflash_cfi01.c

index c8f1cf5a87229d8a06de427bba2bfdd66ed2e706..2f3d1dd509c66cbccf2277999c54b0cab4e7e230 100644 (file)
@@ -614,6 +614,7 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset,
             if (!pfl->counter) {
                 trace_pflash_write(pfl->name, "block write finished");
                 pfl->wcycle++;
+                break;
             }
 
             pfl->counter--;