diff options
author | Julia Lawall <julia@diku.dk> | 2009-07-28 11:53:24 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-09-10 11:11:12 -0400 |
commit | 6223011fb9f90fab92635f1f782196cbd2ccf24f (patch) | |
tree | 61a7c3c2ef16c66187df99b7258eadf976a096c2 /virt | |
parent | 28bcb112183cb822a394b155a2e7d788fe4a109a (diff) |
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: Julia Lawall <julia@diku.dk>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'virt')
-rw-r--r-- | virt/kvm/eventfd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c index 99017e8a92ac..bb4ebd89b9ff 100644 --- a/virt/kvm/eventfd.c +++ b/virt/kvm/eventfd.c | |||
@@ -230,7 +230,7 @@ fail: | |||
230 | if (eventfd && !IS_ERR(eventfd)) | 230 | if (eventfd && !IS_ERR(eventfd)) |
231 | eventfd_ctx_put(eventfd); | 231 | eventfd_ctx_put(eventfd); |
232 | 232 | ||
233 | if (file && !IS_ERR(file)) | 233 | if (!IS_ERR(file)) |
234 | fput(file); | 234 | fput(file); |
235 | 235 | ||
236 | kfree(irqfd); | 236 | kfree(irqfd); |