From patchwork Sat Jun 15 01:16:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arturo Borrero X-Patchwork-Id: 251566 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 062812C0095 for ; Sat, 15 Jun 2013 11:16:10 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752858Ab3FOBQI (ORCPT ); Fri, 14 Jun 2013 21:16:08 -0400 Received: from smtp3.cica.es ([150.214.5.190]:54363 "EHLO smtp.cica.es" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752857Ab3FOBQH (ORCPT ); Fri, 14 Jun 2013 21:16:07 -0400 Received: from localhost (unknown [127.0.0.1]) by smtp.cica.es (Postfix) with ESMTP id EB91951EDA3; Sat, 15 Jun 2013 01:16:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at cica.es Received: from smtp.cica.es ([127.0.0.1]) by localhost (mail.cica.es [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RUw+4J+Ey0h8; Sat, 15 Jun 2013 03:16:05 +0200 (CEST) Received: from nfdev.cica.es (nfdev.cica.es [IPv6:2a00:9ac0:c1ca:31::220]) by smtp.cica.es (Postfix) with ESMTP id C564A51EDA2; Sat, 15 Jun 2013 03:16:03 +0200 (CEST) Subject: [libnftables PATCH 1/3] nat: xml: fix xml_snprintf buffer offset To: netfilter-devel@vger.kernel.org From: Arturo Borrero Cc: pablo@netfilter.org Date: Sat, 15 Jun 2013 03:16:03 +0200 Message-ID: <20130615011603.3778.67261.stgit@nfdev.cica.es> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This patch fix the buffer offset of the nat snprintf function, so elements are properly printed. Signed-off-by: Arturo Borrero Gonzalez --- src/expr/nat.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/src/expr/nat.c b/src/expr/nat.c index a76f5b5..448d2e3 100644 --- a/src/expr/nat.c +++ b/src/expr/nat.c @@ -336,19 +336,21 @@ nft_rule_expr_nat_snprintf_xml(char *buf, size_t size, break; } - ret = snprintf(buf, len, "%s", + ret = snprintf(buf+offset, len, "%s", nat->family == AF_INET ? "AF_INET" : "AF_INET6"); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); if (e->flags & (1 << NFT_EXPR_NAT_REG_ADDR_MIN)) { - ret = snprintf(buf, len, "%u" - " %u ", + ret = snprintf(buf+offset, len, + "%u" + "%u", nat->sreg_addr_min, nat->sreg_addr_max); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } if (e->flags & (1 << NFT_EXPR_NAT_REG_PROTO_MIN)) { - ret = snprintf(buf, len, "%u" + ret = snprintf(buf+offset, len, + "%u" "%u", nat->sreg_proto_min, nat->sreg_proto_max); SNPRINTF_BUFFER_SIZE(ret, size, len, offset);