aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoganaden Velvindron <logan@elandsys.com>2014-11-09 06:15:05 -0800
committerLorenzo Colitti <lorenzo@google.com>2015-03-19 13:10:52 +0900
commit0b311d26d0513a11f1234169677d0232614d572c (patch)
tree8516344c07c58b7e8bffef4d87dc282de2c42715
parenta0f89f3f70c6bf2ebd7a33685b8ab0f08ad3679b (diff)
downloadplatform_external_iptables-0b311d26d0513a11f1234169677d0232614d572c.tar.gz
platform_external_iptables-0b311d26d0513a11f1234169677d0232614d572c.tar.bz2
platform_external_iptables-0b311d26d0513a11f1234169677d0232614d572c.zip
extensions: libxt_TEE: Trim kernel struct to allow deletion
Correct trimming of userspacesize to fix deletions. Fixes: Bugzilla #884. The rule having TEE target with '--oif' option cannot be deleted by iptables command. $ iptables -I INPUT -i foo -j TEE --gateway x.x.x.x --oif bar $ iptables -D INPUT -i foo -j TEE --gateway x.x.x.x --oif bar iptables: No chain/target/match by that name. [Cherry-pick of iptables df3741332d86629a8fdd267930e0a249803f6aa8] Signed-off-by: Loganaden Velvindron <logan@elandsys.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Change-Id: Ieb43487811669d502074330a0cba7c8d4c9c7446
-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 92c7601c..66c060d3 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,