From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CA6AC433E2 for ; Tue, 21 Jul 2020 00:24:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3F3A1207FC for ; Tue, 21 Jul 2020 00:24:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726982AbgGUAY1 (ORCPT ); Mon, 20 Jul 2020 20:24:27 -0400 Received: from correo.us.es ([193.147.175.20]:38624 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726567AbgGUAY1 (ORCPT ); Mon, 20 Jul 2020 20:24:27 -0400 Received: from antivirus1-rhel7.int (unknown [192.168.2.11]) by mail.us.es (Postfix) with ESMTP id A793FC4800 for ; Tue, 21 Jul 2020 02:24:26 +0200 (CEST) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 9AD84DA722 for ; Tue, 21 Jul 2020 02:24:26 +0200 (CEST) Received: by antivirus1-rhel7.int (Postfix, from userid 99) id 90752DA73D; Tue, 21 Jul 2020 02:24:26 +0200 (CEST) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 831ADDA722 for ; Tue, 21 Jul 2020 02:24:24 +0200 (CEST) Received: from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int (F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); Tue, 21 Jul 2020 02:24:24 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int) Received: from localhost.localdomain (unknown [90.77.255.23]) (Authenticated sender: pneira@us.es) by entrada.int (Postfix) with ESMTPA id 689224265A32 for ; Tue, 21 Jul 2020 02:24:24 +0200 (CEST) X-SMTPAUTHUS: auth mail.us.es From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Subject: [PATCH nft] rule: missing map command expansion Date: Tue, 21 Jul 2020 02:24:21 +0200 Message-Id: <20200721002421.5811-1-pablo@netfilter.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Virus-Scanned: ClamAV using ClamSMTP Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Maps also need to be split in two commands for proper error reporting. Fixes: c9eae091983a ("src: add CMD_OBJ_SETELEMS") Signed-off-by: Pablo Neira Ayuso --- src/rule.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rule.c b/src/rule.c index 6b71dfee0d09..dadb26f85567 100644 --- a/src/rule.c +++ b/src/rule.c @@ -1519,6 +1519,7 @@ void nft_cmd_expand(struct cmd *cmd) list_splice(&new_cmds, &cmd->list); break; case CMD_OBJ_SET: + case CMD_OBJ_MAP: set = cmd->set; memset(&h, 0, sizeof(h)); handle_merge(&h, &set->handle); -- 2.20.1