tests/qtest/libqos/ahci.c: Avoid NULL dereference in ahci_exec()
PATCH 1/1 tests/qtest/libqos/ahci.c: Avoid NULL dereference in ahci_exec()
In ahci_exec() we attempt to permit the caller to pass a NULL pointer for opts_in (in which case we use a default set of options). However although we check for NULL when setting up the opts variable at the top of the function, we unconditionally dereference opts_in at the end of the function as part of freeing the opts->buffer.
Switch to checking whether the final buffer is the same as the buffer we started with, instead of assuming the value we started with is always opts_in->buffer.
At the moment all the callers pass a non-NULL opts argument, so we never saw any crashes in practice.
--- tests/qtest/libqos/ahci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tests/qtest/libqos/ahci.c +4 -1
@@ -637,10 +637,13 @@ void ahci_exec(AHCIQState *ahci, uint8_t port,AHCICommand *cmd;int rc;AHCIOpts *opts; +uint64_t buffer_in; opts =g_memdup ((opts_in ==NULL ? &default_opts : opts_in),sizeof (AHCIOpts)); + buffer_in = opts->buffer; +/* No guest buffer provided, create one. */ if (opts->size && !opts->buffer) { opts->buffer =ahci_alloc (ahci, opts->size);
@@ -686,7 +689,7 @@ void ahci_exec(AHCIQState *ahci, uint8_t port, g_assert_cmpint(rc, ==, 0); }ahci_command_free (cmd); -if (opts->buffer != opts_in->buffer) { +if (opts->buffer != buffer_in) {ahci_free (ahci, opts->buffer); }g_free (opts);
Signature · 1 line
2.20.1
Paolo Bonzini
AppliedQuoted 39 lines · Peter Maydell
In
ahci_exec()we attempt to permit the caller to pass a NULL pointer foropts_in(in which case we use a default set of options). However although we check for NULL when setting up the opts variable at the top of the function, we unconditionally dereferenceopts_inat the end of the function as part of freeing theopts->buffer.Switch to checking whether the final buffer is the same as the buffer we started with, instead of assuming the value we started with is always
opts_in->buffer.At the moment all the callers pass a non-NULL opts argument, so we never saw any crashes in practice.
Fixes Coverity CID 1432302Signed-off-by Peter Maydell <[email protected]>--- tests/qtest/libqos/ahci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)tests/qtest/libqos/ahci.c +3
-0@@ -637,10 +637,13 @@ void ahci_exec(AHCIQState *ahci, uint8_t port,AHCICommand *cmd;int rc;AHCIOpts *opts; +uint64_t buffer_in; opts =g_memdup ((opts_in ==NULL ? &default_opts : opts_in),sizeof (AHCIOpts)); + buffer_in = opts->buffer; +/* No guest buffer provided, create one. */ if (opts->size && !opts->buffer) { opts->buffer =ahci_alloc (ahci, opts->size);
tests/qtest/libqos/ahci.c void ahci_exec(AHCIQState *ahci, uint8_t port, · line 695
Quoted 8 lines
tests/qtest/libqos/ahci.c +1
-1@@ -686,7 +689,7 @@ void ahci_exec(AHCIQState *ahci, uint8_t port, g_assert_cmpint(rc, ==, 0); }ahci_command_free (cmd); -if (opts->buffer != opts_in->buffer) { +if (opts->buffer != buffer_in) {ahci_free (ahci, opts->buffer); }g_free (opts);
Queued, thanks.
Paolo