aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/ipv4/netfilter/ip_tables.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index 64ffe57ef1b3..a8f1a2a6c1d4 100644
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -1479,12 +1479,6 @@ struct compat_ipt_replace {
1479 struct compat_ipt_entry entries[0]; 1479 struct compat_ipt_entry entries[0];
1480}; 1480};
1481 1481
1482static inline int compat_copy_match_to_user(struct ipt_entry_match *m,
1483 void __user **dstptr, compat_uint_t *size)
1484{
1485 return xt_compat_match_to_user(m, dstptr, size);
1486}
1487
1488static int 1482static int
1489compat_copy_entry_to_user(struct ipt_entry *e, void __user **dstptr, 1483compat_copy_entry_to_user(struct ipt_entry *e, void __user **dstptr,
1490 compat_uint_t *size, struct xt_counters *counters, 1484 compat_uint_t *size, struct xt_counters *counters,
@@ -1506,7 +1500,7 @@ compat_copy_entry_to_user(struct ipt_entry *e, void __user **dstptr,
1506 goto out; 1500 goto out;
1507 1501
1508 *dstptr += sizeof(struct compat_ipt_entry); 1502 *dstptr += sizeof(struct compat_ipt_entry);
1509 ret = IPT_MATCH_ITERATE(e, compat_copy_match_to_user, dstptr, size); 1503 ret = IPT_MATCH_ITERATE(e, xt_compat_match_to_user, dstptr, size);
1510 target_offset = e->target_offset - (origsize - *size); 1504 target_offset = e->target_offset - (origsize - *size);
1511 if (ret) 1505 if (ret)
1512 goto out; 1506 goto out;