diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-11-12 17:11:22 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-11-12 17:11:22 +0000 |
| commit | 6db87aae61bc6ac0a8cd9bc2e05d7ebfbcfd3657 (patch) | |
| tree | 70693400826a27b43ad493c8a0eb606b24da31df /job.c | |
| parent | 5704c36d25ee84e7129722cb0db53df9faefe943 (diff) | |
| parent | 1a42e5d8298d1b0f90d2254e7d559391dd3a45ca (diff) | |
| download | focaccia-qemu-6db87aae61bc6ac0a8cd9bc2e05d7ebfbcfd3657.tar.gz focaccia-qemu-6db87aae61bc6ac0a8cd9bc2e05d7ebfbcfd3657.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches: - file-posix: Don't waste a file descriptor for locking, don't lock the same bit multiple times - nvme: Fix double free and memory leak - Misc error handling fixes - Added NULL checks found by static analysis - Allow more block drivers to not be included in the qemu build # gpg: Signature made Mon 12 Nov 2018 17:05:00 GMT # gpg: using RSA key 7F09B272C88F2FD6 # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6 * remotes/kevin/tags/for-upstream: qcow2: Read outside array bounds in qcow2_pre_write_overlap_check() block: Fix potential Null pointer dereferences in vvfat.c qemu-img: assert block_job_get() does not return NULL in img_commit() block: Null pointer dereference in blk_root_get_parent_desc() job: Fix off-by-one assert checks for JobSTT and JobVerbTable block: Make more block drivers compile-time configurable tests: Add unit tests for image locking file-posix: Drop s->lock_fd file-posix: Skip effectiveless OFD lock operations nvme: free cmbuf in nvme_exit nvme: don't unref ctrl_mem when device unrealized blockdev: Consistently use snapshot_node_name in external_snapshot_prepare() blockdev: handle error on block latency histogram set error file-posix: Use error API properly Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'job.c')
| -rw-r--r-- | job.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/job.c b/job.c index c65e01bbfa..da8e4b7bf2 100644 --- a/job.c +++ b/job.c @@ -159,7 +159,7 @@ bool job_is_internal(Job *job) static void job_state_transition(Job *job, JobStatus s1) { JobStatus s0 = job->status; - assert(s1 >= 0 && s1 <= JOB_STATUS__MAX); + assert(s1 >= 0 && s1 < JOB_STATUS__MAX); trace_job_state_transition(job, job->ret, JobSTT[s0][s1] ? "allowed" : "disallowed", JobStatus_str(s0), JobStatus_str(s1)); @@ -174,7 +174,7 @@ static void job_state_transition(Job *job, JobStatus s1) int job_apply_verb(Job *job, JobVerb verb, Error **errp) { JobStatus s0 = job->status; - assert(verb >= 0 && verb <= JOB_VERB__MAX); + assert(verb >= 0 && verb < JOB_VERB__MAX); trace_job_apply_verb(job, JobStatus_str(s0), JobVerb_str(verb), JobVerbTable[verb][s0] ? "allowed" : "prohibited"); if (JobVerbTable[verb][s0]) { |