From db305a9299f5c111cb9ace2d6576025122e8d4d6 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 25 Jun 2009 18:32:12 +0200 Subject: [PATCH] --- yaml --- r: 184179 b: refs/heads/master c: b402405d71beed8e4df354844353f66b4e18269f h: refs/heads/master i: 184177: 52799e73d544a81a2c58b6ca2c754de03b5e3d04 184175: 64358d65e9d6a3bf44d1237b9217cbf9a67bce4a v: v3 --- [refs] | 2 +- trunk/net/netfilter/x_tables.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f51bb2e4405b..5cac82f859c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2249065f4b22b493bae2caf549b86f175f33188e +refs/heads/master: b402405d71beed8e4df354844353f66b4e18269f diff --git a/trunk/net/netfilter/x_tables.c b/trunk/net/netfilter/x_tables.c index 255ab0657ce8..12503199826f 100644 --- a/trunk/net/netfilter/x_tables.c +++ b/trunk/net/netfilter/x_tables.c @@ -366,8 +366,10 @@ 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 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, + par->match->revision, XT_ALIGN(par->match->matchsize), size); 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) { 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, + par->target->revision, XT_ALIGN(par->target->targetsize), size); return -EINVAL; }