| From foo@baz Wed Aug 22 09:42:09 CEST 2018 |
| From: Florian Westphal <fw@strlen.de> |
| Date: Wed, 4 Jul 2018 20:25:32 +0200 |
| Subject: netfilter: x_tables: set module owner for icmp(6) matches |
| |
| From: Florian Westphal <fw@strlen.de> |
| |
| [ Upstream commit d376bef9c29b3c65aeee4e785fffcd97ef0a9a81 ] |
| |
| nft_compat relies on xt_request_find_match to increment |
| refcount of the module that provides the match/target. |
| |
| The (builtin) icmp matches did't set the module owner so it |
| was possible to rmmod ip(6)tables while icmp extensions were still in use. |
| |
| Signed-off-by: Florian Westphal <fw@strlen.de> |
| Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/ipv4/netfilter/ip_tables.c | 1 + |
| net/ipv6/netfilter/ip6_tables.c | 1 + |
| 2 files changed, 2 insertions(+) |
| |
| --- a/net/ipv4/netfilter/ip_tables.c |
| +++ b/net/ipv4/netfilter/ip_tables.c |
| @@ -1913,6 +1913,7 @@ static struct xt_match ipt_builtin_mt[] |
| .checkentry = icmp_checkentry, |
| .proto = IPPROTO_ICMP, |
| .family = NFPROTO_IPV4, |
| + .me = THIS_MODULE, |
| }, |
| }; |
| |
| --- a/net/ipv6/netfilter/ip6_tables.c |
| +++ b/net/ipv6/netfilter/ip6_tables.c |
| @@ -1934,6 +1934,7 @@ static struct xt_match ip6t_builtin_mt[] |
| .checkentry = icmp6_checkentry, |
| .proto = IPPROTO_ICMPV6, |
| .family = NFPROTO_IPV6, |
| + .me = THIS_MODULE, |
| }, |
| }; |
| |