Google Git
Sign in
qemu / qemu / 56e477a56399c4e6d7fc0f6227fd9c475f83a8ce
commit56e477a56399c4e6d7fc0f6227fd9c475f83a8ce[log] [tgz]
authorMarkus Armbruster <armbru@redhat.com>Wed Dec 04 10:36:12 2019 +0100
committerMarkus Armbruster <armbru@redhat.com>Wed Dec 18 08:36:15 2019 +0100
treeac9b26e93d91996395aabb618e4f8efd22c8a22d
parent53cb2fc859bef4116bb5e8ef9a80ca6c05963d6f [diff]
exec: Fix file_ram_alloc() error API violations

When os_mem_prealloc() fails, file_ram_alloc() calls qemu_ram_munmap()
and returns null.  Except it doesn't when its @errp argument is null,
because it checks for failure with (errp && *errp).  Introduced in
commit 056b68af77 "fix qemu exit on memory hotplug when allocation
fails at prealloc time".

No caller actually passes null.

Fix anyway: splice in a local Error *err, and error_propagate().

Cc: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20191204093625.14836-6-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
1 file changed
tree: ac9b26e93d91996395aabb618e4f8efd22c8a22d
  1. accel/
  2. audio/
  3. authz/
  4. backends/
  5. block/
  6. bsd-user/
  7. chardev/
  8. contrib/
  9. crypto/
  10. default-configs/
  11. disas/
  12. docs/
  13. dump/
  14. fpu/
  15. fsdev/
  16. gdb-xml/
  17. hw/
  18. include/
  19. io/
  20. libdecnumber/
  21. linux-headers/
  22. linux-user/
  23. migration/
  24. monitor/
  25. nbd/
  26. net/
  27. pc-bios/
  28. plugins/
  29. po/
  30. python/
  31. qapi/
  32. qga/
  33. qobject/
  34. qom/
  35. replay/
  36. roms/
  37. scripts/
  38. scsi/
  39. stubs/
  40. target/
  41. tcg/
  42. tests/
  43. trace/
  44. ui/
  45. util/
  46. capstone
  47. dtc
  48. slirp
  49. .cirrus.yml
  50. .dir-locals.el
  51. .editorconfig
  52. .exrc
  53. .gdbinit
  54. .gitignore
  55. .gitlab-ci.yml
  56. .gitmodules
  57. .gitpublish
  58. .mailmap
  59. .patchew.yml
  60. .shippable.yml
  61. .travis.yml
  62. arch_init.c
  63. balloon.c
  64. block.c
  65. blockdev-nbd.c
  66. blockdev.c
  67. blockjob.c
  68. bootdevice.c
  69. Changelog
  70. CODING_STYLE.rst
  71. configure
  72. COPYING
  73. COPYING.LIB
  74. cpus-common.c
  75. cpus.c
  76. device-hotplug.c
  77. device_tree.c
  78. disas.c
  79. dma-helpers.c
  80. exec-vary.c
  81. exec.c
  82. gdbstub.c
  83. gitdm.config
  84. hmp-commands-info.hx
  85. hmp-commands.hx
  86. ioport.c
  87. iothread.c
  88. job-qmp.c
  89. job.c
  90. Kconfig.host
  91. LICENSE
  92. MAINTAINERS
  93. Makefile
  94. Makefile.objs
  95. Makefile.target
  96. memory.c
  97. memory_ldst.inc.c
  98. memory_mapping.c
  99. module-common.c
  100. os-posix.c
  101. os-win32.c
  102. qdev-monitor.c
  103. qemu-bridge-helper.c
  104. qemu-deprecated.texi
  105. qemu-doc.texi
  106. qemu-edid.c
  107. qemu-img-cmds.hx
  108. qemu-img.c
  109. qemu-img.texi
  110. qemu-io-cmds.c
  111. qemu-io.c
  112. qemu-keymap.c
  113. qemu-nbd.c
  114. qemu-nbd.texi
  115. qemu-option-trace.texi
  116. qemu-options-wrapper.h
  117. qemu-options.h
  118. qemu-options.hx
  119. qemu-seccomp.c
  120. qemu-tech.texi
  121. qemu.nsi
  122. qemu.sasl
  123. qtest.c
  124. README.rst
  125. replication.c
  126. replication.h
  127. rules.mak
  128. thunk.c
  129. tpm.c
  130. trace-events
  131. VERSION
  132. version.rc
  133. vl.c