[lxc-devel] [lxd/master] forkproxy: fix epoll

[brauner on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 496 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20190321/6f55649d/attachment.bin>
-------------- next part --------------
From 659ebb29acbaf194e360ebc49f833597506ab7e3 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Thu, 21 Mar 2019 21:13:33 +0100
Subject: [PATCH] forkproxy: fix epoll

Fixes: https://discuss.linuxcontainers.org/t/lxd-proxy-device-tcp-not-responding/4356/18
Suggested-by: nomi <nomi at click-mail.net>
Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
---
 lxd/main_forkproxy.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lxd/main_forkproxy.go b/lxd/main_forkproxy.go
index 0a8d7fd242..18b4c345c1 100644
--- a/lxd/main_forkproxy.go
+++ b/lxd/main_forkproxy.go
@@ -660,7 +660,7 @@ func (c *cmdForkproxy) Run(cmd *cobra.Command, args []string) error {
 			ev.events |= C.EPOLLONESHOT
 		}
 
-		*(*C.int)(unsafe.Pointer(uintptr(unsafe.Pointer(&ev)) + unsafe.Sizeof(ev.events))) = C.int(f.Fd())
+		*(*C.int)(unsafe.Pointer(&ev.data)) = C.int(f.Fd())
 		ret := C.epoll_ctl(epFd, C.EPOLL_CTL_ADD, C.int(f.Fd()), &ev)
 		if ret < 0 {
 			return fmt.Errorf("Failed to add listener fd to epoll instance")
@@ -677,7 +677,8 @@ func (c *cmdForkproxy) Run(cmd *cobra.Command, args []string) error {
 		}
 
 		for i := C.int(0); i < nfds; i++ {
-			curFd := *(*C.int)(unsafe.Pointer(uintptr(unsafe.Pointer(&events[i])) + unsafe.Sizeof(events[i].events)))
+
+			curFd := *(*C.int)(unsafe.Pointer(&events[i].data))
 			srcConn, ok := listenerMap[int(curFd)]
 			if !ok {
 				continue