kvm: Fix kvm_vm_ioctl() and kvm_device_ioctl() return value
PATCH v2 1/1 kvm: Fix kvm_vm_ioctl() and kvm_device_ioctl() return value
These functions wrap ioctl(). When ioctl() fails, it sets @errno. The wrappers then return that @errno negated.
Except they call accel_ioctl_end() between calling ioctl() and reading @errno. accel_ioctl_end() can clobber @errno, e.g. when a futex() system call fails. Seems unlikely, but it's a bug all the same.
Fix by retrieving @errno before calling accel_ioctl_end().
--- accel/kvm/kvm-all.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
accel/kvm/kvm-all.c +2 -2
@@ -3373,10 +3373,10 @@ int kvm_vm_ioctl(KVMState *s, unsigned long type, ...)trace_kvm_vm_ioctl (type, arg);accel_ioctl_begin (); ret =ioctl (s->vmfd, type, arg); -accel_ioctl_end ();if (ret ==-1 ) { ret = -errno; } +accel_ioctl_end ();return ret; }
@@ -3413,10 +3413,10 @@ int kvm_device_ioctl(int fd, unsigned long type, ...)trace_kvm_device_ioctl (fd, type, arg);accel_ioctl_begin (); ret =ioctl (fd, type, arg); -accel_ioctl_end ();if (ret ==-1 ) { ret = -errno; } +accel_ioctl_end ();return ret; }
Signature · 1 line
2.49.0
Quoted 7 lines · Markus Armbruster
These functions wrap
ioctl(). Whenioctl()fails, it sets @errno. The wrappers then return that @errno negated.Except they call
accel_ioctl_end()between callingioctl()and reading @errno.accel_ioctl_end()can clobber @errno, e.g. when afutex()system call fails. Seems unlikely, but it's a bug all the same.
Quoted 5 lines
Fix by retrieving @errno before calling
accel_ioctl_end().Fixes a27dd2de68f3 (KVM: keep track of running ioctls)Signed-off-by Markus Armbruster <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Queued for 10.2.
Quoted 7 lines · Markus Armbruster
These functions wrap
ioctl(). Whenioctl()fails, it sets @errno. The wrappers then return that @errno negated.Except they call
accel_ioctl_end()between callingioctl()and reading @errno.accel_ioctl_end()can clobber @errno, e.g. when afutex()system call fails. Seems unlikely, but it's a bug all the same.
Quoted 5 lines
Fix by retrieving @errno before calling
accel_ioctl_end().Fixes a27dd2de68f3 (KVM: keep track of running ioctls)Signed-off-by Markus Armbruster <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Isn't this a qemu-stable material?
Thanks,
/mjt
Quoted 8 lines · Michael Tokarev
Quoted 7 lines · Markus Armbruster
These functions wrap
ioctl(). Whenioctl()fails, it sets @errno. The wrappers then return that @errno negated.Except they call
accel_ioctl_end()between callingioctl()and reading @errno.accel_ioctl_end()can clobber @errno, e.g. when afutex()system call fails. Seems unlikely, but it's a bug all the same.
Quoted 7 lines
Quoted 5 lines
Fix by retrieving @errno before calling
accel_ioctl_end().Fixes a27dd2de68f3 (KVM: keep track of running ioctls)Signed-off-by Markus Armbruster <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>Isn't this a qemu-stable material?
I think it is. I should've thought of adding Cc: qemu-stable. My apologies!