From fd0ee5b9a59255bde003830f8124cc3a59536735 Mon Sep 17 00:00:00 2001
From: Tomas Hozza <thozza@redhat.com>
Date: Thu, 8 Nov 2012 10:53:29 +0100
Subject: [PATCH] --- yaml --- r: 336967 b: refs/heads/master c:
 95a69adab9acfc3981c504737a2b6578e4d846ef h: refs/heads/master i:   336965:
 2921fa98acbcde5a50ad64c4956a51c62b689f46   336963:
 40ea7a92c51481a777d4c8a8e702acd30b942932   336959:
 7a4ab012dbe554110eebad18967b313a74a6c183 v: v3

---
 [refs]                         | 2 +-
 trunk/tools/hv/hv_kvp_daemon.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 69dd97160469..f97b6acb126d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aeba4a06f28fad11b1e61d150bd3cde3008b80c8
+refs/heads/master: 95a69adab9acfc3981c504737a2b6578e4d846ef
diff --git a/trunk/tools/hv/hv_kvp_daemon.c b/trunk/tools/hv/hv_kvp_daemon.c
index 13c2a142331d..c1d910243d49 100644
--- a/trunk/tools/hv/hv_kvp_daemon.c
+++ b/trunk/tools/hv/hv_kvp_daemon.c
@@ -1486,13 +1486,19 @@ int main(void)
 		len = recvfrom(fd, kvp_recv_buffer, sizeof(kvp_recv_buffer), 0,
 				addr_p, &addr_l);
 
-		if (len < 0 || addr.nl_pid) {
+		if (len < 0) {
 			syslog(LOG_ERR, "recvfrom failed; pid:%u error:%d %s",
 					addr.nl_pid, errno, strerror(errno));
 			close(fd);
 			return -1;
 		}
 
+		if (addr.nl_pid) {
+			syslog(LOG_WARNING, "Received packet from untrusted pid:%u",
+					addr.nl_pid);
+			continue;
+		}
+
 		incoming_msg = (struct nlmsghdr *)kvp_recv_buffer;
 		incoming_cn_msg = (struct cn_msg *)NLMSG_DATA(incoming_msg);
 		hv_msg = (struct hv_kvp_msg *)incoming_cn_msg->data;