diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2018-01-28 09:17:03 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2018-01-28 09:17:03 +0100 |
| commit | 08d47756d0a89616bd2d134de46e5f613f293e2b (patch) | |
| tree | 51945496d567aee4e03966cddcd7e0fdd12a0529 | |
| parent | 08146b1a84f975e2cc1007242b4202dc5cc0e5c5 (diff) | |
executor: fix 32-bit support
ipt_get_entries.entrytable must be pointer aligned,
so in 32-bit build there is no padding before it.
| -rw-r--r-- | executor/common_linux.h | 3 | ||||
| -rw-r--r-- | pkg/csource/linux_common.go | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/executor/common_linux.h b/executor/common_linux.h index 30a5a0c49..d636c85f9 100644 --- a/executor/common_linux.h +++ b/executor/common_linux.h @@ -971,8 +971,7 @@ struct ipt_getinfo { struct ipt_get_entries { char name[32]; unsigned int size; - unsigned int pad; - char entrytable[1024]; + void* entrytable[1024 / sizeof(void*)]; }; struct xt_counters { diff --git a/pkg/csource/linux_common.go b/pkg/csource/linux_common.go index 49d7df124..b02e61188 100644 --- a/pkg/csource/linux_common.go +++ b/pkg/csource/linux_common.go @@ -2003,8 +2003,7 @@ struct ipt_getinfo { struct ipt_get_entries { char name[32]; unsigned int size; - unsigned int pad; - char entrytable[1024]; + void* entrytable[1024 / sizeof(void*)]; }; struct xt_counters { |