netfilter: nfnetlink_queue: reject verdict request from different portid

[pandora-kernel.git] / tools / hv / hv_kvp_daemon.c

diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index 323d4d9..5e19410 100644 (file)
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -348,7 +348,7 @@ int main(void)
        fd = socket(AF_NETLINK, SOCK_DGRAM, NETLINK_CONNECTOR);
        if (fd < 0) {
                syslog(LOG_ERR, "netlink socket creation failed; error:%d", fd);
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
        addr.nl_family = AF_NETLINK;
        addr.nl_pad = 0;
@@ -360,7 +360,7 @@ int main(void)
        if (error < 0) {
                syslog(LOG_ERR, "bind failed; error:%d", error);
                close(fd);
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
        sock_opt = addr.nl_groups;
        setsockopt(fd, 270, 1, &sock_opt, sizeof(sock_opt));
@@ -378,7 +378,7 @@ int main(void)
        if (len < 0) {
                syslog(LOG_ERR, "netlink_send failed; error:%d", len);
                close(fd);
-               exit(-1);
+               exit(EXIT_FAILURE);
        }
 
        pfd.fd = fd;
@@ -393,13 +393,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);
 
@@ -497,7 +503,7 @@ int main(void)
                len = netlink_send(fd, incoming_cn_msg);
                if (len < 0) {
                        syslog(LOG_ERR, "net_link send failed; error:%d", len);
-                       exit(-1);
+                       exit(EXIT_FAILURE);
                }
        }