[PATCH 3/9 nf-next] netfilter: nfnetlink: use DEBUG_NET_WARN_ON_ONCE for attribute validation

[Fernando Fernandez Mancera <fmancera@suse.de>]

Replace WARN_ON and WARN_ONCE with DEBUG_NET_WARN_ON_ONCE in the
nfnetlink and cttimeout interfaces. These validation failures are
already handled by returning -EINVAL to userspace.

Signed-off-by: Fernando Fernandez Mancera <fmancera@suse.de>
---
 net/netfilter/nfnetlink.c           | 4 +++-
 net/netfilter/nfnetlink_cttimeout.c | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index 47f3ed441f64..8c4c8bfedd64 100644
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -117,8 +117,10 @@ int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n)
 
 	/* Sanity-check attr_count size to avoid stack buffer overflow. */
 	for (cb_id = 0; cb_id < n->cb_count; cb_id++)
-		if (WARN_ON(n->cb[cb_id].attr_count > NFNL_MAX_ATTR_COUNT))
+		if (unlikely(n->cb[cb_id].attr_count > NFNL_MAX_ATTR_COUNT)) {
+			DEBUG_NET_WARN_ON_ONCE(1);
 			return -EINVAL;
+		}
 
 	nfnl_lock(n->subsys_id);
 	if (table[n->subsys_id].subsys) {
diff --git a/net/netfilter/nfnetlink_cttimeout.c b/net/netfilter/nfnetlink_cttimeout.c
index dca6826af7de..c33558a02e8e 100644
--- a/net/netfilter/nfnetlink_cttimeout.c
+++ b/net/netfilter/nfnetlink_cttimeout.c
@@ -476,7 +476,8 @@ static int cttimeout_default_get(struct sk_buff *skb,
 		timeouts = &nf_generic_pernet(info->net)->timeout;
 		break;
 	default:
-		WARN_ONCE(1, "Missing timeouts for proto %d", l4proto->l4proto);
+		pr_warn_once("Missing timeouts for proto %d\n", l4proto->l4proto);
+		DEBUG_NET_WARN_ON_ONCE(1);
 		break;
 	}
 
-- 
2.54.0