From: Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp>
Date: Tue, 7 Apr 2009 05:02:24 +0000 (+0900)
Subject: Fix infinite loop if receiving a NLMSG_NOOP packet.
X-Git-Tag: v0.34~65^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9b0b26d8bf46719b05e8ebf7bccb829ba1cec93;p=thirdparty%2Flibcgroup.git

Fix infinite loop if receiving a NLMSG_NOOP packet.

Hi,

I tested 'cgred' service and I saw the problem that some processes
are not moved to a right cgroup. This problem did not occur always,
and it did sometimes. I reviewed cgrulesengd.c and found the bug
cgrulesengd stays in an infinite loop if receiving a NLMSG_NOOP
packet.

This patch fixes this problem.

Signed-off-by: Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp>
Acked-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Signed-off-by: Dhaval Giani <dhaval@linux.vnet.ibm.com>
---

diff --git a/src/daemon/cgrulesengd.c b/src/daemon/cgrulesengd.c
index 8efdce1a..4e00e184 100644
--- a/src/daemon/cgrulesengd.c
+++ b/src/daemon/cgrulesengd.c
@@ -386,8 +386,10 @@ int cgre_create_netlink_socket_process_msg()
 			continue;
 		while (NLMSG_OK(nlh, recv_len)) {
 			cn_hdr = NLMSG_DATA(nlh);
-			if (nlh->nlmsg_type == NLMSG_NOOP)
+			if (nlh->nlmsg_type == NLMSG_NOOP) {
+				nlh = NLMSG_NEXT(nlh, recv_len);
 				continue;
+			}
 			if ((nlh->nlmsg_type == NLMSG_ERROR) ||
 					(nlh->nlmsg_type == NLMSG_OVERRUN))
 				break;