netfilter: nf_log: handle NFPROTO_INET properly in nf_logger_[find_get|put]

When we request NFPROTO_INET, it means both NFPROTO_IPV4 and NFPROTO_IPV6.

Signed-off-by: Liping Zhang <liping.zhang@spreadtrum.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
index a5d41dfa9f05d6363d0ea3253493a7539842df32..73b845d3cd33f494fe3aba821f6edda91a5d9e81 100644 (file)
--- a/net/netfilter/nf_log.c
+++ b/net/netfilter/nf_log.c
@@ -159,6 +159,20 @@ int nf_logger_find_get(int pf, enum nf_log_type type)
        struct nf_logger *logger;
        int ret = -ENOENT;
 
+       if (pf == NFPROTO_INET) {
+               ret = nf_logger_find_get(NFPROTO_IPV4, type);
+               if (ret < 0)
+                       return ret;
+
+               ret = nf_logger_find_get(NFPROTO_IPV6, type);
+               if (ret < 0) {
+                       nf_logger_put(NFPROTO_IPV4, type);
+                       return ret;
+               }
+
+               return 0;
+       }
+
        if (rcu_access_pointer(loggers[pf][type]) == NULL)
                request_module("nf-logger-%u-%u", pf, type);
 
@@ -179,6 +193,12 @@ void nf_logger_put(int pf, enum nf_log_type type)
 {
        struct nf_logger *logger;
 
+       if (pf == NFPROTO_INET) {
+               nf_logger_put(NFPROTO_IPV4, type);
+               nf_logger_put(NFPROTO_IPV6, type);
+               return;
+       }
+
        BUG_ON(loggers[pf][type] == NULL);
 
        rcu_read_lock();

diff --git a/net/netfilter/nft_log.c b/net/netfilter/nft_log.c
index 319c22b4bca2386c0ba6f95bca3e0aba104660d0..713d66837705596f128eb2822da1cedd7fcc6762 100644 (file)
--- a/net/netfilter/nft_log.c
+++ b/net/netfilter/nft_log.c
@@ -52,7 +52,6 @@ static int nft_log_init(const struct nft_ctx *ctx,
        struct nft_log *priv = nft_expr_priv(expr);
        struct nf_loginfo *li = &priv->loginfo;
        const struct nlattr *nla;
-       int ret;
 
        nla = tb[NFTA_LOG_PREFIX];
        if (nla != NULL) {
@@ -97,19 +96,6 @@ static int nft_log_init(const struct nft_ctx *ctx,
                break;
        }
 
-       if (ctx->afi->family == NFPROTO_INET) {
-               ret = nf_logger_find_get(NFPROTO_IPV4, li->type);
-               if (ret < 0)
-                       return ret;
-
-               ret = nf_logger_find_get(NFPROTO_IPV6, li->type);
-               if (ret < 0) {
-                       nf_logger_put(NFPROTO_IPV4, li->type);
-                       return ret;
-               }
-               return 0;
-       }
-
        return nf_logger_find_get(ctx->afi->family, li->type);
 }
 
@@ -122,12 +108,7 @@ static void nft_log_destroy(const struct nft_ctx *ctx,
        if (priv->prefix != nft_log_null_prefix)
                kfree(priv->prefix);
 
-       if (ctx->afi->family == NFPROTO_INET) {
-               nf_logger_put(NFPROTO_IPV4, li->type);
-               nf_logger_put(NFPROTO_IPV6, li->type);
-       } else {
-               nf_logger_put(ctx->afi->family, li->type);
-       }
+       nf_logger_put(ctx->afi->family, li->type);
 }
 
 static int nft_log_dump(struct sk_buff *skb, const struct nft_expr *expr)