From patchwork Fri Aug 25 16:10:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Iremonger, Bernard" X-Patchwork-Id: 28009 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id B19B07D62; Fri, 25 Aug 2017 18:10:48 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 9B5177D53; Fri, 25 Aug 2017 18:10:46 +0200 (CEST) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Aug 2017 09:10:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,426,1498546800"; d="scan'208";a="142009744" Received: from sivswdev01.ir.intel.com (HELO localhost.localdomain) ([10.237.217.45]) by orsmga005.jf.intel.com with ESMTP; 25 Aug 2017 09:10:44 -0700 From: Bernard Iremonger To: dev@dpdk.org, ferruh.yigit@intel.com, konstantin.ananyev@intel.com, cristian.dumitrescu@intel.com, adrien.mazarguil@6wind.com Cc: Bernard Iremonger , stable@dpdk.org Date: Fri, 25 Aug 2017 17:10:33 +0100 Message-Id: <1503677438-27591-2-git-send-email-bernard.iremonger@intel.com> X-Mailer: git-send-email 1.7.0.7 In-Reply-To: <1503496275-27492-1-git-send-email-bernard.iremonger@intel.com> References: <1503496275-27492-1-git-send-email-bernard.iremonger@intel.com> Subject: [dpdk-dev] [PATCH v2 1/6] librte_table: fix acl entry add and delete functions X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The rte_table_acl_entry_add() function was returning data from acl_memory instead of acl_rule_memory. It was also returning data from entry instead of entry_ptr. The rte_table_acl_entry_delete() function was returning data from acl_memory instead of acl_rule_memory. Fixes: 166923eb2f78 ("table: ACL") Cc: stable@dpdk.org Signed-off-by: Bernard Iremonger --- lib/librte_table/rte_table_acl.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/librte_table/rte_table_acl.c b/lib/librte_table/rte_table_acl.c index 3c05e4a..e84b437 100644 --- a/lib/librte_table/rte_table_acl.c +++ b/lib/librte_table/rte_table_acl.c @@ -316,8 +316,7 @@ struct rte_table_acl { if (status == 0) { *key_found = 1; *entry_ptr = &acl->memory[i * acl->entry_size]; - memcpy(*entry_ptr, entry, acl->entry_size); - + memcpy(entry, *entry_ptr, acl->entry_size); return 0; } } @@ -353,8 +352,8 @@ struct rte_table_acl { rte_acl_free(acl->ctx); acl->ctx = ctx; *key_found = 0; - *entry_ptr = &acl->memory[free_pos * acl->entry_size]; - memcpy(*entry_ptr, entry, acl->entry_size); + *entry_ptr = &acl->acl_rule_memory[free_pos * acl->entry_size]; + memcpy(entry, *entry_ptr, acl->entry_size); return 0; } @@ -435,7 +434,7 @@ struct rte_table_acl { acl->ctx = ctx; *key_found = 1; if (entry != NULL) - memcpy(entry, &acl->memory[pos * acl->entry_size], + memcpy(entry, &acl->acl_rule_memory[pos * acl->entry_size], acl->entry_size); return 0;