Mailing List Archive

[xen staging] tools/9pfsd: add missing va_end() in fill_data()
commit bb1619ed4f2edcc7140b6a130b42a553da78fa10
Author: Juergen Gross <jgross@suse.com>
AuthorDate: Thu Feb 22 11:51:56 2024 +0100
Commit: Jan Beulich <jbeulich@suse.com>
CommitDate: Thu Feb 22 11:51:56 2024 +0100

tools/9pfsd: add missing va_end() in fill_data()

In xen-9pfsd fill_data() va_end() needs to be called before returning.

Coverity Id CID 1592145

Fixes: bcec59cf7ff4 ("tools/xen-9pfsd: add 9pfs version request support")
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
---
tools/9pfsd/io.c | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/tools/9pfsd/io.c b/tools/9pfsd/io.c
index ebc4102713..adb887c7d9 100644
--- a/tools/9pfsd/io.c
+++ b/tools/9pfsd/io.c
@@ -445,7 +445,7 @@ static int fill_data(struct ring *ring, const char *fmt, ...)
if ( !*f || array_sz )
fmt_err(fmt);
if ( !chk_data(ring, data, sizeof(uint16_t)) )
- return pars;
+ goto out;
array_sz = get_unaligned((uint16_t *)data);
data += sizeof(uint16_t);
*(unsigned int *)par = array_sz;
@@ -455,10 +455,10 @@ static int fill_data(struct ring *ring, const char *fmt, ...)

case 'b':
if ( !chk_data(ring, data, sizeof(uint8_t)) )
- return pars;
+ goto out;
if ( !fill_data_elem(&par, array, &array_sz, sizeof(uint8_t),
data) )
- return pars;
+ goto out;
data += sizeof(uint8_t);
break;

@@ -466,48 +466,48 @@ static int fill_data(struct ring *ring, const char *fmt, ...)
if ( array_sz )
fmt_err(fmt);
if ( !chk_data(ring, data, sizeof(uint32_t)) )
- return pars;
+ goto out;
len = get_unaligned((uint32_t *)data);
data += sizeof(uint32_t);
*(unsigned int *)par = len;
par = va_arg(ap, void *);
if ( !chk_data(ring, data, len) )
- return pars;
+ goto out;
memcpy(par, data, len);
data += len;
break;

case 'L':
if ( !chk_data(ring, data, sizeof(uint64_t)) )
- return pars;
+ goto out;
if ( !fill_data_elem(&par, array, &array_sz, sizeof(uint64_t),
data) )
- return pars;
+ goto out;
data += sizeof(uint64_t);
break;

case 'S':
if ( !chk_data(ring, data, sizeof(uint16_t)) )
- return pars;
+ goto out;
len = get_unaligned((uint16_t *)data);
data += sizeof(uint16_t);
if ( !chk_data(ring, data, len) )
- return pars;
+ goto out;
str_off = add_string(ring, data, len);
if ( str_off == ~0 )
- return pars;
+ goto out;
if ( !fill_data_elem(&par, array, &array_sz, sizeof(unsigned int),
&str_off) )
- return pars;
+ goto out;
data += len;
break;

case 'U':
if ( !chk_data(ring, data, sizeof(uint32_t)) )
- return pars;
+ goto out;
if ( !fill_data_elem(&par, array, &array_sz, sizeof(uint32_t),
data) )
- return pars;
+ goto out;
data += sizeof(uint32_t);
break;

@@ -520,6 +520,9 @@ static int fill_data(struct ring *ring, const char *fmt, ...)
pars++;
}

+ out:
+ va_end(ap);
+
return pars;
}

--
generated by git-patchbot for /home/xen/git/xen.git#staging