Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42107f50 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Patrick McHardy
Browse files

netfilter: xtables: symmetric COMPAT_XT_ALIGN definition 



Rewrite COMPAT_XT_ALIGN in terms of dummy structure hack.
Compat counters logically have nothing to do with it.
Use ALIGN() macro while I'm at it for same types.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 0a026046

include/linux/netfilter/x_tables.h

+9 −4
Original line number Diff line number Diff line
@@ -93,8 +93,7 @@ struct _xt_align { 
	__u64 u64;

};



#define XT_ALIGN(s) (((s) + (__alignof__(struct _xt_align)-1)) 	\

			& ~(__alignof__(struct _xt_align)-1))

#define XT_ALIGN(s) ALIGN((s), __alignof__(struct _xt_align))



/* Standard return verdict, or do jump. */

#define XT_STANDARD_TARGET ""
@@ -571,8 +570,14 @@ struct compat_xt_counters_info { 
	struct compat_xt_counters counters[0];

};



#define COMPAT_XT_ALIGN(s) (((s) + (__alignof__(struct compat_xt_counters)-1)) \

		& ~(__alignof__(struct compat_xt_counters)-1))

struct _compat_xt_align {

	__u8 u8;

	__u16 u16;

	__u32 u32;

	compat_u64 u64;

};



#define COMPAT_XT_ALIGN(s) ALIGN((s), __alignof__(struct _compat_xt_align))



extern void xt_compat_lock(u_int8_t af);

extern void xt_compat_unlock(u_int8_t af);

net/netfilter/x_tables.c

+2 −2
Original line number Diff line number Diff line
@@ -364,7 +364,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 match: invalid size %Zu != %u\n",

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

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

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

		return -EINVAL;
@@ -514,7 +514,7 @@ 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 %Zu != %u\n",

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

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

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

		return -EINVAL;