summaryrefslogtreecommitdiffstats
path: root/net/netfilter
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2016-04-01 14:17:33 +0200
committerSasha Levin <sasha.levin@oracle.com>2016-07-10 23:07:36 -0400
commit2756b2a32469316c98a46359710ea2bfdbfe331e (patch)
tree2d4ec03231e48fa1d4ceb1d2f360a6833d8f0b13 /net/netfilter
parent05e089b3a29c6c965fa9c8801ea72d21a959ca46 (diff)
downloadlinux-stable-2756b2a32469316c98a46359710ea2bfdbfe331e.tar.gz
linux-stable-2756b2a32469316c98a46359710ea2bfdbfe331e.tar.bz2
linux-stable-2756b2a32469316c98a46359710ea2bfdbfe331e.zip
netfilter: x_tables: xt_compat_match_from_user doesn't need a retval
[ Upstream commit 0188346f21e6546498c2a0f84888797ad4063fc5 ] Always returned 0. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'net/netfilter')
-rw-r--r--net/netfilter/x_tables.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index 5e5cc459dbcb..a9143696e9b9 100644
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -528,8 +528,8 @@ int xt_compat_match_offset(const struct xt_match *match)
}
EXPORT_SYMBOL_GPL(xt_compat_match_offset);
-int xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr,
- unsigned int *size)
+void xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr,
+ unsigned int *size)
{
const struct xt_match *match = m->u.kernel.match;
struct compat_xt_entry_match *cm = (struct compat_xt_entry_match *)m;
@@ -551,7 +551,6 @@ int xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr,
*size += off;
*dstptr += msize;
- return 0;
}
EXPORT_SYMBOL_GPL(xt_compat_match_from_user);