Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90d72ce0 authored by Nadav Amit's avatar Nadav Amit Committed by Greg Kroah-Hartman
Browse files

vmw_balloon: fix inflation with batching 



Embarrassingly, the recent fix introduced worse problem than it solved,
causing the balloon not to inflate. The VM informed the hypervisor that
the pages for lock/unlock are sitting in the wrong address, as it used
the page that is used the uninitialized page variable.

Fixes: b23220fe ("vmw_balloon: fixing double free when batching mode is off")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarXavier Deguillard <xdeguillard@vmware.com>
Signed-off-by: default avatarNadav Amit <namit@vmware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7daf201d

drivers/misc/vmw_balloon.c

+2 −2
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ static int vmballoon_send_batched_lock(struct vmballoon *b, 
		unsigned int num_pages, bool is_2m_pages, unsigned int *target)

{

	unsigned long status;

	unsigned long pfn = page_to_pfn(b->page);

	unsigned long pfn = PHYS_PFN(virt_to_phys(b->batch_page));



	STATS_INC(b->stats.lock[is_2m_pages]);
@@ -515,7 +515,7 @@ static bool vmballoon_send_batched_unlock(struct vmballoon *b, 
		unsigned int num_pages, bool is_2m_pages, unsigned int *target)

{

	unsigned long status;

	unsigned long pfn = page_to_pfn(b->page);

	unsigned long pfn = PHYS_PFN(virt_to_phys(b->batch_page));



	STATS_INC(b->stats.unlock[is_2m_pages]);