Commit 1b6cd671 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: x_tables: use pr ratelimiting in xt core 



most messages are converted to info, since they occur in response to
wrong usage.

Size mismatch however is a real error (xtables ABI bug) that should not
occur.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 0cc9501f

net/netfilter/x_tables.c

+34 −36
Original line number Diff line number Diff line
@@ -434,8 +434,7 @@ int xt_check_match(struct xt_mtchk_param *par, 
		 * ebt_among is exempt from centralized matchsize checking

		 * because it uses a dynamic-size data set.

		 */

		pr_err("%s_tables: %s.%u match: invalid size "

		       "%u (kernel) != (user) %u\n",

		pr_err_ratelimited("%s_tables: %s.%u match: invalid size %u (kernel) != (user) %u\n",

				   xt_prefix[par->family], par->match->name,

				   par->match->revision,

				   XT_ALIGN(par->match->matchsize), size);
@@ -443,7 +442,7 @@ int xt_check_match(struct xt_mtchk_param *par, 
	}

	if (par->match->table != NULL &&

	    strcmp(par->match->table, par->table) != 0) {

		pr_err("%s_tables: %s match: only valid in %s table, not %s\n",

		pr_info_ratelimited("%s_tables: %s match: only valid in %s table, not %s\n",

				    xt_prefix[par->family], par->match->name,

				    par->match->table, par->table);

		return -EINVAL;
@@ -451,17 +450,17 @@ int xt_check_match(struct xt_mtchk_param *par, 
	if (par->match->hooks && (par->hook_mask & ~par->match->hooks) != 0) {

		char used[64], allow[64];



		pr_err("%s_tables: %s match: used from hooks %s, but only "

		       "valid from %s\n",

		pr_info_ratelimited("%s_tables: %s match: used from hooks %s, but only valid from %s\n",

				    xt_prefix[par->family], par->match->name,

		       textify_hooks(used, sizeof(used), par->hook_mask,

		                     par->family),

		       textify_hooks(allow, sizeof(allow), par->match->hooks,

				    textify_hooks(used, sizeof(used),

						  par->hook_mask, par->family),

				    textify_hooks(allow, sizeof(allow),

						  par->match->hooks,

						  par->family));

		return -EINVAL;

	}

	if (par->match->proto && (par->match->proto != proto || inv_proto)) {

		pr_err("%s_tables: %s match: only valid for protocol %u\n",

		pr_info_ratelimited("%s_tables: %s match: only valid for protocol %u\n",

				    xt_prefix[par->family], par->match->name,

				    par->match->proto);

		return -EINVAL;
@@ -814,8 +813,7 @@ int xt_check_target(struct xt_tgchk_param *par, 
	int ret;



	if (XT_ALIGN(par->target->targetsize) != size) {

		pr_err("%s_tables: %s.%u target: invalid size "

		       "%u (kernel) != (user) %u\n",

		pr_err_ratelimited("%s_tables: %s.%u target: invalid size %u (kernel) != (user) %u\n",

				   xt_prefix[par->family], par->target->name,

				   par->target->revision,

				   XT_ALIGN(par->target->targetsize), size);
@@ -823,7 +821,7 @@ int xt_check_target(struct xt_tgchk_param *par, 
	}

	if (par->target->table != NULL &&

	    strcmp(par->target->table, par->table) != 0) {

		pr_err("%s_tables: %s target: only valid in %s table, not %s\n",

		pr_info_ratelimited("%s_tables: %s target: only valid in %s table, not %s\n",

				    xt_prefix[par->family], par->target->name,

				    par->target->table, par->table);

		return -EINVAL;
@@ -831,17 +829,17 @@ int xt_check_target(struct xt_tgchk_param *par, 
	if (par->target->hooks && (par->hook_mask & ~par->target->hooks) != 0) {

		char used[64], allow[64];



		pr_err("%s_tables: %s target: used from hooks %s, but only "

		       "usable from %s\n",

		pr_info_ratelimited("%s_tables: %s target: used from hooks %s, but only usable from %s\n",

				    xt_prefix[par->family], par->target->name,

		       textify_hooks(used, sizeof(used), par->hook_mask,

		                     par->family),

		       textify_hooks(allow, sizeof(allow), par->target->hooks,

				    textify_hooks(used, sizeof(used),

						  par->hook_mask, par->family),

				    textify_hooks(allow, sizeof(allow),

						  par->target->hooks,

						  par->family));

		return -EINVAL;

	}

	if (par->target->proto && (par->target->proto != proto || inv_proto)) {

		pr_err("%s_tables: %s target: only valid for protocol %u\n",

		pr_info_ratelimited("%s_tables: %s target: only valid for protocol %u\n",

				    xt_prefix[par->family], par->target->name,

				    par->target->proto);

		return -EINVAL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE