From patchwork Tue Jul 5 17:15:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Carlos_Falgueras_Garc=C3=ADa?= X-Patchwork-Id: 644917 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 3rkVrk2Fbxz9sXy for ; Wed, 6 Jul 2016 03:15:34 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=riseup.net header.i=@riseup.net header.b=PDvwyvUh; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755441AbcGERPd (ORCPT ); Tue, 5 Jul 2016 13:15:33 -0400 Received: from mx1.riseup.net ([198.252.153.129]:58726 "EHLO mx1.riseup.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755383AbcGERPc (ORCPT ); Tue, 5 Jul 2016 13:15:32 -0400 Received: from piha.riseup.net (unknown [10.0.1.163]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.riseup.net (Postfix) with ESMTPS id 52DAA1A230A; Tue, 5 Jul 2016 17:15:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1467738930; bh=cn47iwutLtjLLAX6kjjh6pmV6agDafaHM9SHXANKYq0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PDvwyvUhguOPzOWxkK2OKjJWTjjRN4z6UzzSYj2DwcIvo7ppR5wIhQUVoxAdqihzZ z0s7CoCrVlMp20EvB/7mjoF/CooLRX4iQS6z1acVvgzSlxesP40JwDO42KtX1apTY+ vGRy3xrlPQ+HmpIgNZ8CohiLpwnMBJWMM3hHeXVQ= Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: carlosfg) with ESMTPSA id 4534A1C035F From: =?UTF-8?q?Carlos=20Falgueras=20Garc=C3=ADa?= To: netfilter-devel@vger.kernel.org Cc: pablo@netfilter.org Subject: [PATCH 1/2 libnfntl] Fix nftnl_*_set_str Date: Tue, 5 Jul 2016 19:15:16 +0200 Message-Id: <1467738917-17597-1-git-send-email-carlosfg@riseup.net> In-Reply-To: <20160705123125.GA27152@salvia> References: <20160705123125.GA27152@salvia> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.99.2 at mx1.riseup.net X-Virus-Status: Clean Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org These lengths must be one character longer to take account the null character Signed-off-by: Carlos Falgueras García --- src/chain.c | 2 +- src/rule.c | 2 +- src/set.c | 2 +- src/set_elem.c | 2 +- src/table.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chain.c b/src/chain.c index bfffbe0..cab64b5 100644 --- a/src/chain.c +++ b/src/chain.c @@ -260,7 +260,7 @@ EXPORT_SYMBOL_ALIAS(nftnl_chain_set_u8, nft_chain_attr_set_u8); int nftnl_chain_set_str(struct nftnl_chain *c, uint16_t attr, const char *str) { - return nftnl_chain_set_data(c, attr, str, strlen(str)); + return nftnl_chain_set_data(c, attr, str, strlen(str) + 1); } EXPORT_SYMBOL_ALIAS(nftnl_chain_set_str, nft_chain_attr_set_str); diff --git a/src/rule.c b/src/rule.c index c87fea7..2b23c8e 100644 --- a/src/rule.c +++ b/src/rule.c @@ -198,7 +198,7 @@ EXPORT_SYMBOL_ALIAS(nftnl_rule_set_u64, nft_rule_attr_set_u64); int nftnl_rule_set_str(struct nftnl_rule *r, uint16_t attr, const char *str) { - return nftnl_rule_set_data(r, attr, str, strlen(str)); + return nftnl_rule_set_data(r, attr, str, strlen(str) + 1); } EXPORT_SYMBOL_ALIAS(nftnl_rule_set_str, nft_rule_attr_set_str); diff --git a/src/set.c b/src/set.c index 9315bf0..e48ff78 100644 --- a/src/set.c +++ b/src/set.c @@ -203,7 +203,7 @@ EXPORT_SYMBOL_ALIAS(nftnl_set_set_u64, nft_set_attr_set_u64); int nftnl_set_set_str(struct nftnl_set *s, uint16_t attr, const char *str) { - return nftnl_set_set(s, attr, str); + return nftnl_set_set_data(s, attr, str, strlen(str) + 1); } EXPORT_SYMBOL_ALIAS(nftnl_set_set_str, nft_set_attr_set_str); diff --git a/src/set_elem.c b/src/set_elem.c index 00b7327..40b5bfe 100644 --- a/src/set_elem.c +++ b/src/set_elem.c @@ -149,7 +149,7 @@ EXPORT_SYMBOL_ALIAS(nftnl_set_elem_set_u64, nft_set_elem_attr_set_u64); int nftnl_set_elem_set_str(struct nftnl_set_elem *s, uint16_t attr, const char *str) { - return nftnl_set_elem_set(s, attr, str, strlen(str)); + return nftnl_set_elem_set(s, attr, str, strlen(str) + 1); } EXPORT_SYMBOL_ALIAS(nftnl_set_elem_set_str, nft_set_elem_attr_set_str); diff --git a/src/table.c b/src/table.c index 32d119f..966b923 100644 --- a/src/table.c +++ b/src/table.c @@ -131,7 +131,7 @@ EXPORT_SYMBOL_ALIAS(nftnl_table_set_u8, nft_table_attr_set_u8); int nftnl_table_set_str(struct nftnl_table *t, uint16_t attr, const char *str) { - return nftnl_table_set_data(t, attr, str, 0); + return nftnl_table_set_data(t, attr, str, strlen(str) + 1); } EXPORT_SYMBOL_ALIAS(nftnl_table_set_str, nft_table_attr_set_str);