It's been quiet on the arm front this week, so all I have is

these coverity fixes I posted a while back...

The following changes since commit 853546f8128476eefb701d4a55b2781bb3a46faa:

Merge tag 'pull-loongarch-20240322' of https://gitlab.com/gaosong/qemu into staging (2024-03-22 10:59:57 +0000)

https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20240325

for you to fetch changes up to 55c79639d553c1b7a82b4cde781ad5f316f45b0e:

tests/qtest/libqtest.c: Check for g_setenv() failure (2024-03-25 10:41:01 +0000)

* Fixes for seven minor coverity issues

Peter Maydell (7):

tests/qtest/npcm7xx_emc_test: Don't leak cmd_line

tests/unit/socket-helpers: Don't close(-1)

net/af-xdp.c: Don't leak sock_fds array in net_init_af_xdp()

hw/misc/pca9554: Correct error check bounds in get/set pin functions

hw/nvram/mac_nvram: Report failure to write data

tests/unit/test-throttle: Avoid unintended integer division

tests/qtest/libqtest.c: Check for g_setenv() failure

hw/misc/pca9554.c | 4 ++--

hw/nvram/mac_nvram.c | 5 ++++-

net/af-xdp.c | 3 +--

tests/qtest/libqtest.c | 6 +++++-

tests/qtest/npcm7xx_emc-test.c | 4 ++--

tests/unit/socket-helpers.c | 4 +++-

tests/unit/test-throttle.c | 4 ++--

7 files changed, 19 insertions(+), 11 deletions(-)

There's no way for the macio_nvram device to report failure to write

data, but we can at least report it to the user with error_report()

as we do in other devices like xlnx-efuse.

Spotted by Coverity.

Resolves: Coverity CID 1507628

hw/nvram/mac_nvram.c | 5 ++++-

1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c

--- a/hw/nvram/mac_nvram.c

+++ b/hw/nvram/mac_nvram.c

@@ -XXX,XX +XXX,XX @@ static void macio_nvram_writeb(void *opaque, hwaddr addr,

trace_macio_nvram_write(addr, value);

s->data[addr] = value;

if (s->blk) {

- blk_pwrite(s->blk, addr, 1, &s->data[addr], 0);

+ if (blk_pwrite(s->blk, addr, 1, &s->data[addr], 0) < 0) {

+ error_report("%s: write of NVRAM data to backing store failed",

+ blk_name(s->blk));

}

2.34.1

In test_compute_wait() we do

double units = bkt.max / 10;

which does an integer division and then assigns it to a double variable,

and similarly later on in the expression for an assertion.

Use 10.0 so that we do a floating point division and calculate the

exact value, rather than doing an integer division.

Spotted by Coverity.

Resolves: Coverity CID 1432564

tests/unit/test-throttle.c | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/unit/test-throttle.c b/tests/unit/test-throttle.c

--- a/tests/unit/test-throttle.c

+++ b/tests/unit/test-throttle.c

@@ -XXX,XX +XXX,XX @@ static void test_compute_wait(void)

bkt.avg = 10;

bkt.max = 200;

for (i = 0; i < 22; i++) {

- double units = bkt.max / 10;

+ double units = bkt.max / 10.0;

bkt.level += units;

bkt.burst_level += units;

throttle_leak_bucket(&bkt, NANOSECONDS_PER_SECOND / 10);

wait = throttle_compute_wait(&bkt);

g_assert(double_cmp(bkt.burst_level, 0));

- g_assert(double_cmp(bkt.level, (i + 1) * (bkt.max - bkt.avg) / 10));

+ g_assert(double_cmp(bkt.level, (i + 1) * (bkt.max - bkt.avg) / 10.0));

/* We can do bursts for the 2 seconds we have configured in

* burst_length. We have 100 extra milliseconds of burst

* because bkt.level has been leaking during this time.

2.34.1

Coverity points out that g_setenv() can fail and we don't

check for this in qtest_inproc_init(). In practice this will

only fail if a memory allocation failed in setenv() or if

the caller passed an invalid architecture name (e.g. one

with an '=' in it), so rather than requiring the callsite

to check for failure, make g_setenv() failure fatal here,

similarly to what we did in commit aca68d95c515.

Resolves: Coverity CID 1497485

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Reviewed-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Message-id: 20240312183810.557768-8-peter.maydell@linaro.org

---

tests/qtest/libqtest.c | 6 +++++-

1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c

index XXXXXXX..XXXXXXX 100644

--- a/tests/qtest/libqtest.c

+++ b/tests/qtest/libqtest.c

@@ -XXX,XX +XXX,XX @@ QTestState *qtest_inproc_init(QTestState **s, bool log, const char* arch,

* way, qtest_get_arch works for inproc qtest.

*/

gchar *bin_path = g_strconcat("/qemu-system-", arch, NULL);

- g_setenv("QTEST_QEMU_BINARY", bin_path, 0);

+ if (!g_setenv("QTEST_QEMU_BINARY", bin_path, 0)) {

+ fprintf(stderr,

+ "Could not set environment variable QTEST_QEMU_BINARY\n");

+ exit(1);

+ }

g_free(bin_path);

return qts;

--

2.34.1