From patchwork Sun Aug 16 19:05:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 507731 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D83CC140311 for ; Mon, 17 Aug 2015 05:06:32 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751924AbbHPTGY (ORCPT ); Sun, 16 Aug 2015 15:06:24 -0400 Received: from Chamillionaire.breakpoint.cc ([80.244.247.6]:34747 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751500AbbHPTGM (ORCPT ); Sun, 16 Aug 2015 15:06:12 -0400 Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.80) (envelope-from ) id 1ZR3Fy-00032r-UC; Sun, 16 Aug 2015 21:06:11 +0200 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH 06/12] src: netlink: don't truncate set key lengths Date: Sun, 16 Aug 2015 21:05:49 +0200 Message-Id: <1439751955-31190-7-git-send-email-fw@strlen.de> X-Mailer: git-send-email 2.0.5 In-Reply-To: <1439751955-31190-1-git-send-email-fw@strlen.de> References: <1439751955-31190-1-git-send-email-fw@strlen.de> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org If key is e.g. 12 bits, pretend its 16 instead of 8. This is needed to make sets work with header fields with size not divisible by 8. Signed-off-by: Florian Westphal --- src/netlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/netlink.c b/src/netlink.c index 8ede8e6..b1296cf 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -1100,7 +1100,7 @@ static int netlink_add_set_compat(struct netlink_ctx *ctx, nft_set_attr_set_u32(nls, NFT_SET_ATTR_KEY_TYPE, dtype_map_to_kernel(set->keytype)); nft_set_attr_set_u32(nls, NFT_SET_ATTR_KEY_LEN, - set->keylen / BITS_PER_BYTE); + div_round_up(set->keylen, BITS_PER_BYTE)); if (set->flags & NFT_SET_MAP) { nft_set_attr_set_u32(nls, NFT_SET_ATTR_DATA_TYPE, dtype_map_to_kernel(set->datatype)); @@ -1135,7 +1135,7 @@ static int netlink_add_set_batch(struct netlink_ctx *ctx, nft_set_attr_set_u32(nls, NFT_SET_ATTR_KEY_TYPE, dtype_map_to_kernel(set->keytype)); nft_set_attr_set_u32(nls, NFT_SET_ATTR_KEY_LEN, - set->keylen / BITS_PER_BYTE); + div_round_up(set->keylen, BITS_PER_BYTE)); if (set->flags & NFT_SET_MAP) { nft_set_attr_set_u32(nls, NFT_SET_ATTR_DATA_TYPE, dtype_map_to_kernel(set->datatype));