Messages in this thread Patch in this message | | | From | Dexuan Cui <> | Subject | [PATCH] hv: hv_balloon: avoid memory leak on alloc_error of 2MB memory block | Date | Sun, 23 Nov 2014 21:56:15 -0800 |
| |
If num_ballooned is not 0, we shouldn't neglect the already-allocated 2MB memory block(s).
Cc: K. Y. Srinivasan <kys@microsoft.com> Cc: <stable@vger.kernel.org> Signed-off-by: Dexuan Cui <decui@microsoft.com> --- drivers/hv/hv_balloon.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c index 5e90c5d..cba2d3b 100644 --- a/drivers/hv/hv_balloon.c +++ b/drivers/hv/hv_balloon.c @@ -1091,6 +1091,8 @@ static void balloon_up(struct work_struct *dummy) bool done = false; int i; + /* The host does balloon_up in 2MB. */ + WARN_ON(num_pages % PAGES_IN_2M != 0); /* * We will attempt 2M allocations. However, if we fail to @@ -1111,7 +1113,7 @@ static void balloon_up(struct work_struct *dummy) bl_resp, alloc_unit, &alloc_error); - if ((alloc_error) && (alloc_unit != 1)) { + if (alloc_error && (alloc_unit != 1) && num_ballooned == 0) { alloc_unit = 1; continue; } -- 1.9.1
| |