linux-kernel - [PATCH] drivers, vmw_balloon.c: Increment alloc and sleep_alloc only when page allocation succeeds.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <1318877852.10091.11.camel@localhost.localdomain>
Date:	Tue, 18 Oct 2011 00:57:31 +0600
From:	Rakib Mullick <rakib.mullick@...il.com>
To:	linux-kernel <linux-kernel@...r.kernel.org>
Cc:	akpm@...ux-foundation.org, Dmitry Torokhov <dtor@...are.com>
Subject: [PATCH] drivers, vmw_balloon.c: Increment alloc and sleep_alloc
 only when page allocation succeeds.

 While doing allocation statistics in vmballoon_reserve_page function, alloc and sleep_alloc has been incremented even if allocation fails. But, b->stats.alloc and b->stats.sleep_alloc supposed to increment only when they succeed. This patch makes sure that, alloc and sleep_alloc gets incremented when page allocation succeeds.

Signed-off-by: Rakib Mullick <rakib.mullick@...il.com>
---

diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c
index 053d36c..d2c25c9 100644
--- a/drivers/misc/vmw_balloon.c
+++ b/drivers/misc/vmw_balloon.c
@@ -414,11 +414,6 @@ static int vmballoon_reserve_page(struct vmballoon *b, bool can_sleep)
 	bool locked = false;

 	do {
-		if (!can_sleep)
-			STATS_INC(b->stats.alloc);
-		else
-			STATS_INC(b->stats.sleep_alloc);
-
 		flags = can_sleep ? VMW_PAGE_ALLOC_CANSLEEP : VMW_PAGE_ALLOC_NOSLEEP;
 		page = alloc_page(flags);
 		if (!page) {
@@ -427,6 +422,11 @@ static int vmballoon_reserve_page(struct vmballoon *b, bool can_sleep)
 			else
 				STATS_INC(b->stats.sleep_alloc_fail);
 			return -ENOMEM;
+		} else {
+			if (!can_sleep)
+				STATS_INC(b->stats.alloc);
+			else
+				STATS_INC(b->stats.sleep_alloc);
 		}

 		/* inform monitor */

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/