Skip to content

Commit

Permalink
KVM: correct error-handling code
Browse files Browse the repository at this point in the history
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: Julia Lawall <julia@diku.dk>
Signed-off-by: Avi Kivity <avi@redhat.com>
  • Loading branch information
Julia Lawall authored and Avi Kivity committed Sep 10, 2009
1 parent 28bcb11 commit 6223011
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion virt/kvm/eventfd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 6223011

Please sign in to comment.