Signed-off-by: Jan Engelhardt <jengelh@xxxxxxxxxx>
---
include/linux/netfilter/x_tables.h | 2 ++
net/netfilter/xt1_support.c | 17 +++++++++++++++++
net/netfilter/xt1_translat.c | 13 +------------
3 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
index ad95d1d..7ccc3fb 100644
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
@@ -732,6 +732,8 @@ extern unsigned int xts_blob_prep_table(struct xt2_table *,
const struct xt1_xlat_info *,
unsigned int *, unsigned int *,
unsigned int *);
+extern int xts_match_to_xt1(void __user **, int *, unsigned int *,
+ const struct xt2_entry_match *);
extern int xts_starget_to_xt1(void __user **, int *, unsigned int *,
const struct xt2_entry_target *,
const struct xt1_xlat_info *);
diff --git a/net/netfilter/xt1_support.c b/net/netfilter/xt1_support.c
index e308844..5844b0d 100644
--- a/net/netfilter/xt1_support.c
+++ b/net/netfilter/xt1_support.c
@@ -204,6 +204,23 @@ xts_blob_prep_table(struct xt2_table *table, const struct xt1_xlat_info *io,
}
EXPORT_SYMBOL_GPL(xts_blob_prep_table);
+int xts_match_to_xt1(void __user **user_ptr, int *len, unsigned int *z,
+ const struct xt2_entry_match *ematch)
+{
+ struct xt_entry_match blob;
+ int ret;
+
+ blob.u.match_size = sizeof(blob) + ematch->dsize;
+ blob.u.user.revision = ematch->ext->revision;
+ strncpy(blob.u.user.name, ematch->ext->name, sizeof(blob.u.user.name));
+ ret = xts_copy_to_user(user_ptr, len, &blob, sizeof(blob), z);
+ if (ret < 0)
+ return ret;
+ return xts_copy_to_user(user_ptr, len, ematch->data,
+ ematch->dsize, z);
+}
+EXPORT_SYMBOL_GPL(xts_match_to_xt1);
+
int xts_starget_to_xt1(void __user **user_ptr, int *len, unsigned int *z,
const struct xt2_entry_target *etarget,
const struct xt1_xlat_info *io)
diff --git a/net/netfilter/xt1_translat.c b/net/netfilter/xt1_translat.c
index d000fe2..c1e82b9 100644
--- a/net/netfilter/xt1_translat.c
+++ b/net/netfilter/xt1_translat.c
@@ -475,20 +475,9 @@ XTSUB2(rule_to_xt1)(void __user **user_ptr, int *len, unsigned int *z,
return ret;
list_for_each_entry_continue(ematch, &rule->match_list, anchor) {
- struct xt_entry_match blob;
-
if (ematch == quota_ematch)
break;
-
- blob.u.match_size = sizeof(blob) + ematch->dsize;
- blob.u.user.revision = ematch->ext->revision;
- strncpy(blob.u.user.name, ematch->ext->name,
- sizeof(blob.u.user.name));
- ret = xts_copy_to_user(user_ptr, len, &blob, sizeof(blob), z);
- if (ret < 0)
- return ret;
- ret = xts_copy_to_user(user_ptr, len, ematch->data,
- ematch->dsize, z);
+ ret = xts_match_to_xt1(user_ptr, len, z, ematch);
if (ret < 0)
return ret;
}
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
