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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 122B5C433F5 for ; Mon, 7 Feb 2022 13:50:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1381204AbiBGNt0 (ORCPT ); Mon, 7 Feb 2022 08:49:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379192AbiBGN2b (ORCPT ); Mon, 7 Feb 2022 08:28:31 -0500 Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [IPv6:2a0a:51c0:0:12e:520::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99288C043181 for ; Mon, 7 Feb 2022 05:28:30 -0800 (PST) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1nH44D-000796-3t; Mon, 07 Feb 2022 14:28:29 +0100 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH nft 2/3] parser_json: fix flowtable device datatype Date: Mon, 7 Feb 2022 14:28:15 +0100 Message-Id: <20220207132816.21129-3-fw@strlen.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220207132816.21129-1-fw@strlen.de> References: <20220207132816.21129-1-fw@strlen.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Failed with: BUG: invalid expresion type symbol Fixes: 78bbe7f7a55be489 ("mnl: do not use expr->identifier to fetch device name") Signed-off-by: Florian Westphal --- src/parser_json.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/parser_json.c b/src/parser_json.c index f07b798adecd..2ab0196461e2 100644 --- a/src/parser_json.c +++ b/src/parser_json.c @@ -3125,7 +3125,9 @@ static struct expr *json_parse_flowtable_devs(struct json_ctx *ctx, size_t index; if (!json_unpack(root, "s", &dev)) { - tmp = symbol_expr_alloc(int_loc, SYMBOL_VALUE, NULL, dev); + tmp = constant_expr_alloc(int_loc, &string_type, + BYTEORDER_HOST_ENDIAN, + strlen(dev) * BITS_PER_BYTE, dev); compound_expr_add(expr, tmp); return expr; } @@ -3141,7 +3143,9 @@ static struct expr *json_parse_flowtable_devs(struct json_ctx *ctx, expr_free(expr); return NULL; } - tmp = symbol_expr_alloc(int_loc, SYMBOL_VALUE, NULL, dev); + tmp = constant_expr_alloc(int_loc, &string_type, + BYTEORDER_HOST_ENDIAN, + strlen(dev) * BITS_PER_BYTE, dev); compound_expr_add(expr, tmp); } return expr; -- 2.34.1