Commit b402405d authored by Jan Engelhardt's avatar Jan Engelhardt
Browse files

netfilter: xtables: print details on size mismatch 



Print which revision has been used and which size are which
(kernel/user) for easier debugging.

Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
parent 2249065f

net/netfilter/x_tables.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -366,8 +366,10 @@ int xt_check_match(struct xt_mtchk_param *par, 
		 * ebt_among is exempt from centralized matchsize checking

		 * ebt_among is exempt from centralized matchsize checking

		 * because it uses a dynamic-size data set.

		 * because it uses a dynamic-size data set.

		 */

		 */

		pr_err("%s_tables: %s match: invalid size %u != %u\n",

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

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

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

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

		       par->match->revision,

		       XT_ALIGN(par->match->matchsize), size);

		       XT_ALIGN(par->match->matchsize), size);

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -516,8 +518,10 @@ int xt_check_target(struct xt_tgchk_param *par, 
		    unsigned int size, u_int8_t proto, bool inv_proto)

		    unsigned int size, u_int8_t proto, bool inv_proto)

{

{

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

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

		pr_err("%s_tables: %s target: invalid size %u != %u\n",

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

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

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

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

		       par->target->revision,

		       XT_ALIGN(par->target->targetsize), size);

		       XT_ALIGN(par->target->targetsize), size);

		return -EINVAL;

		return -EINVAL;

	}

	}