mirror of
https://gitlab.com/qemu-project/qemu.git
synced 2024-11-05 05:52:15 +03:00
qemu-io-cmds: Assert that global and nofile commands don't use ct->perms
It would be a bug for a command with the CMD_NOFILE_OK or CMD_FLAG_GLOBAL flags set to also set the ct->perms field, because the former says "OK for a file not to be open" but the latter is a check on a file. Add an assertion in qemuio_add_command() so we can catch that sort of buggy command definition immediately rather than it being a bug that only manifests when a particular set of command line options is used. (Coverity gets confused about this (CID 1371723) and reports that we might dereference a NULL blk pointer in this case, because it can't tell that that code path never happens with the cmdinfo_t that we have. This commit won't help unconfuse it, but it does fix the underlying issue.) Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 1490967529-4767-1-git-send-email-peter.maydell@linaro.org Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
parent
d1c136885b
commit
6aabeb5839
@ -35,6 +35,13 @@ static int compare_cmdname(const void *a, const void *b)
|
||||
|
||||
void qemuio_add_command(const cmdinfo_t *ci)
|
||||
{
|
||||
/* ci->perm assumes a file is open, but the GLOBAL and NOFILE_OK
|
||||
* flags allow it not to be, so that combination is invalid.
|
||||
* Catch it now rather than letting it manifest as a crash if a
|
||||
* particular set of command line options are used.
|
||||
*/
|
||||
assert(ci->perm == 0 ||
|
||||
(ci->flags & (CMD_FLAG_GLOBAL | CMD_NOFILE_OK)) == 0);
|
||||
cmdtab = g_renew(cmdinfo_t, cmdtab, ++ncmds);
|
||||
cmdtab[ncmds - 1] = *ci;
|
||||
qsort(cmdtab, ncmds, sizeof(*cmdtab), compare_cmdname);
|
||||
|
Loading…
Reference in New Issue
Block a user