aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhao Liu <zhao1.liu@intel.com>2024-02-29 22:39:00 +0800
committerPhilippe Mathieu-Daudé <philmd@linaro.org>2024-03-09 18:51:45 +0100
commite15201171f9dc1e1aeb34bd08831de8af20925d6 (patch)
treeaf4145ae30ce110bb34292ba26b83e5dd5a2c50f
parent8538ceecd3a62c3233e15740cfb7071540547c6b (diff)
downloadqemu-e15201171f9dc1e1aeb34bd08831de8af20925d6.zip
qemu-e15201171f9dc1e1aeb34bd08831de8af20925d6.tar.gz
qemu-e15201171f9dc1e1aeb34bd08831de8af20925d6.tar.bz2
hw/remote/remote-obj: hw/misc/ivshmem: Fix missing ERRP_GUARD() for error_prepend()
As the comment in qapi/error, passing @errp to error_prepend() requires ERRP_GUARD(): * = Why, when and how to use ERRP_GUARD() = * * Without ERRP_GUARD(), use of the @errp parameter is restricted: ... * - It should not be passed to error_prepend(), error_vprepend() or * error_append_hint(), because that doesn't work with &error_fatal. * ERRP_GUARD() lifts these restrictions. * * To use ERRP_GUARD(), add it right at the beginning of the function. * @errp can then be used without worrying about the argument being * NULL or &error_fatal. ERRP_GUARD() could avoid the case when @errp is the pointer of error_fatal, the user can't see this additional information, because exit() happens in error_setg earlier than information is added [1]. The remote_object_set_fd() passes @errp to error_prepend(), and as a PropertyInfo.set method, its @errp is so widely sourced that it is necessary to protect it with ERRP_GUARD(). To avoid the issue like [1] said, add missing ERRP_GUARD() at the beginning of this function. [1]: Issue description in the commit message of commit ae7c80a7bd73 ("error: New macro ERRP_GUARD()"). Cc: Elena Ufimtseva <elena.ufimtseva@oracle.com> Cc: Jagannathan Raman <jag.raman@oracle.com> Signed-off-by: Zhao Liu <zhao1.liu@intel.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-ID: <20240229143914.1977550-4-zhao1.liu@linux.intel.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-rw-r--r--hw/remote/remote-obj.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/remote/remote-obj.c b/hw/remote/remote-obj.c
index 65b6f7c..dc27cc8 100644
--- a/hw/remote/remote-obj.c
+++ b/hw/remote/remote-obj.c
@@ -49,6 +49,7 @@ struct RemoteObject {
static void remote_object_set_fd(Object *obj, const char *str, Error **errp)
{
+ ERRP_GUARD();
RemoteObject *o = REMOTE_OBJECT(obj);
int fd = -1;