[PATCH] virtio_balloon: fix towards_target when deflating balloon

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: <linux-kernel@...>
Cc: Rusty Russell <rusty@...>, Avi Kivity <avi@...>, <virtualization@...>, Linus Torvalds <torvalds@...>, Chris Wright <chrisw@...>, Anthony Liguori <aliguori@...>
Date: Monday, August 18, 2008 - 6:15 pm

Both v and vb->num_pages are u32 and unsigned int respectively.  If v is less
than vb->num_pages (and it is, when deflating the balloon), the result is a
very large 32-bit number.  Since we're returning a s64, instead of getting the
same negative number we desire, we get a very large positive number.

This handles the case where v < vb->num_pages and ensures we get a small,
negative, s64 as the result.

Rusty: please push this for 2.6.27-rc4.  It's probably appropriate for the
stable tree too as it will cause an unexpected OOM when ballooning.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index bfef604..bd3c384 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -158,7 +158,10 @@ static inline s64 towards_target(struct virtio_balloon *vb)
 	vb->vdev->config->get(vb->vdev,
 			      offsetof(struct virtio_balloon_config, num_pages),
 			      &v, sizeof(v));
-	return v - vb->num_pages;
+	if (v < vb->num_pages)
+		return -(s64)(vb->num_pages - v);
+	else
+		return v - vb->num_pages;
 }
 
 static void update_balloon_size(struct virtio_balloon *vb)
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH] virtio_balloon: fix towards_target when deflating ba..., Anthony Liguori, (Mon Aug 18, 6:15 pm)