hv: use correct order when freeing monitor_pages
authorRadim Krčmář <rkrcmar@redhat.com>
Tue, 27 May 2014 17:16:20 +0000 (19:16 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 26 Jun 2014 19:15:41 +0000 (15:15 -0400)
commit a100d88df1e924e5c9678fabf054d1bae7ab74fb upstream.

We try to free two pages when only one has been allocated.
Cleanup path is unlikely, so I haven't found any trace that would fit,
but I hope that free_pages_prepare() does catch it.

Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Reviewed-by: Amos Kong <akong@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/hv/connection.c

index 2e7801a..05827ec 100644 (file)
@@ -224,8 +224,8 @@ cleanup:
                vmbus_connection.int_page = NULL;
        }
 
-       free_pages((unsigned long)vmbus_connection.monitor_pages[0], 1);
-       free_pages((unsigned long)vmbus_connection.monitor_pages[1], 1);
+       free_pages((unsigned long)vmbus_connection.monitor_pages[0], 0);
+       free_pages((unsigned long)vmbus_connection.monitor_pages[1], 0);
        vmbus_connection.monitor_pages[0] = NULL;
        vmbus_connection.monitor_pages[1] = NULL;