2018-10-06 23:34:51

by Nathan Chancellor

[permalink] [raw]
Subject: [PATCH] netfilter: xt_quota: Don't use aligned attribute in sizeof

Clang warns:

net/netfilter/xt_quota.c:47:44: warning: 'aligned' attribute ignored
when parsing type [-Wignored-attributes]
BUILD_BUG_ON(sizeof(atomic64_t) != sizeof(__aligned_u64));
^~~~~~~~~~~~~

Use 'sizeof(__u64)' instead, as the alignment doesn't affect the size
of the type.

Fixes: e9837e55b020 ("netfilter: xt_quota: fix the behavior of xt_quota module")
Signed-off-by: Nathan Chancellor <[email protected]>
---
net/netfilter/xt_quota.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/netfilter/xt_quota.c b/net/netfilter/xt_quota.c
index 6afa7f468a73..fceae245eb03 100644
--- a/net/netfilter/xt_quota.c
+++ b/net/netfilter/xt_quota.c
@@ -44,7 +44,7 @@ static int quota_mt_check(const struct xt_mtchk_param *par)
{
struct xt_quota_info *q = par->matchinfo;

- BUILD_BUG_ON(sizeof(atomic64_t) != sizeof(__aligned_u64));
+ BUILD_BUG_ON(sizeof(atomic64_t) != sizeof(__u64));

if (q->flags & ~XT_QUOTA_MASK)
return -EINVAL;
--
2.19.0



2018-10-08 22:21:48

by Pablo Neira Ayuso

[permalink] [raw]
Subject: Re: [PATCH] netfilter: xt_quota: Don't use aligned attribute in sizeof

On Sat, Oct 06, 2018 at 04:33:31PM -0700, Nathan Chancellor wrote:
> Clang warns:
>
> net/netfilter/xt_quota.c:47:44: warning: 'aligned' attribute ignored
> when parsing type [-Wignored-attributes]
> BUILD_BUG_ON(sizeof(atomic64_t) != sizeof(__aligned_u64));
> ^~~~~~~~~~~~~
>
> Use 'sizeof(__u64)' instead, as the alignment doesn't affect the size
> of the type.

Applied, thanks.