Commit 6223011f authored by Julia Lawall's avatar Julia Lawall Committed by Avi Kivity

KVM: correct error-handling code

This code is not executed before file has been initialized to the result of
calling eventfd_fget.  This function returns an ERR_PTR value in an error
case instead of NULL.  Thus the test that file is not NULL is always true.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@match exists@
expression x, E;
statement S1, S2;
@@

x = eventfd_fget(...)
... when != x = E
(
*  if (x == NULL || ...) S1 else S2
|
*  if (x == NULL && ...) S1 else S2
)
// </smpl>
Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 28bcb112
......@@ -230,7 +230,7 @@ kvm_irqfd_assign(struct kvm *kvm, int fd, int gsi)
if (eventfd && !IS_ERR(eventfd))
eventfd_ctx_put(eventfd);
if (file && !IS_ERR(file))
if (!IS_ERR(file))
fput(file);
kfree(irqfd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment