aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2015-03-19 06:09:24 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-03-19 06:09:25 +0000
commit0b0de5664c08f07a048fc8dc2048c95aa8f8c0bb (patch)
tree8516344c07c58b7e8bffef4d87dc282de2c42715
parenta0f89f3f70c6bf2ebd7a33685b8ab0f08ad3679b (diff)
parent0b311d26d0513a11f1234169677d0232614d572c (diff)
downloadandroid_external_iptables-0b0de5664c08f07a048fc8dc2048c95aa8f8c0bb.tar.gz
android_external_iptables-0b0de5664c08f07a048fc8dc2048c95aa8f8c0bb.tar.bz2
android_external_iptables-0b0de5664c08f07a048fc8dc2048c95aa8f8c0bb.zip
Merge "extensions: libxt_TEE: Trim kernel struct to allow deletion"
-rw-r--r--extensions/libxt_TEE.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/extensions/libxt_TEE.c b/extensions/libxt_TEE.c
index 92c7601..66c060d 100644
--- a/extensions/libxt_TEE.c
+++ b/extensions/libxt_TEE.c
@@ -99,7 +99,7 @@ static struct xtables_target tee_tg_reg[] = {
.revision = 1,
.family = NFPROTO_IPV4,
.size = XT_ALIGN(sizeof(struct xt_tee_tginfo)),
- .userspacesize = XT_ALIGN(sizeof(struct xt_tee_tginfo)),
+ .userspacesize = offsetof(struct xt_tee_tginfo, priv),
.help = tee_tg_help,
.print = tee_tg_print,
.save = tee_tg_save,
@@ -112,7 +112,7 @@ static struct xtables_target tee_tg_reg[] = {
.revision = 1,
.family = NFPROTO_IPV6,
.size = XT_ALIGN(sizeof(struct xt_tee_tginfo)),
- .userspacesize = XT_ALIGN(sizeof(struct xt_tee_tginfo)),
+ .userspacesize = offsetof(struct xt_tee_tginfo, priv),
.help = tee_tg_help,
.print = tee_tg6_print,
.save = tee_tg6_save,