From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6E76245A50 for ; Sat, 28 Sep 2024 18:48:47 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 152DA4066D; Sat, 28 Sep 2024 18:48:42 +0200 (CEST) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mails.dpdk.org (Postfix) with ESMTP id 2E28F4060F for ; Sat, 28 Sep 2024 18:48:33 +0200 (CEST) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2068bee21d8so35145535ad.2 for ; Sat, 28 Sep 2024 09:48:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1727542112; x=1728146912; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PmRTbddZLG2JxQ2OFMT3a37iU/8U3GJd/GKLMFfTKa0=; b=0O/HMTwbAH+2T5UdCiT8AajGM6Ezc1LM2gU9ewljWjmNXJ6WLEORxTB1vEFd2HLRvp 4JtoHw3hR8O2Pib/WHDp1SeXT+jxr24hj79XVrtkgxZWeKgNDL/PpW/2mM78tYO/C63u 8n3Hg2SspQq74gdH/ztNbBU2CffgzYpLInkK8R4MCzdjhjlIkkgsIxTQPfbIxG81TAv7 6U+cczTKov9fY6jbZzwRDQy77UYrT4WzhULiJalOpoIK4QlSN6B+apjcpPLAUNcO5Muw +A1hoz89tJGwXToVPRHRPUtvF7xVvADlVE+HxBSERFtyN53AqAevQX+Es1N+9yJXJ0hV mNzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727542112; x=1728146912; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PmRTbddZLG2JxQ2OFMT3a37iU/8U3GJd/GKLMFfTKa0=; b=MUsCV8rE7MGThUfRwnDWGID0FISzAje/MUXINjXnHOhCgG3EchF4gM9NfuKNkgGu8M aOk1X7Tana+Mb86xNgK4SLD/a2T/D/vdK1/tC0l5b1upS3lgpfqLfioH3/IxWbAZ0AGf 1NCQ0lHt+/fWZNW9m22NHc6gAYWa8iBN2zHaZ9tplbC3ZEASB5xHLPU1RHroXAL9+sgt yOm79i6LFQz2UjQYn5Eg3NCyyWsctSqfMejGhmR+kj45hrvqxuLXPHSSxStJyQFGrlna kh44OOhEFmv5Tehmm0p9Eqq1RKinax0vN5LjWryi0478R7bY3suQPyRqr2ktpbRCDB76 c3dA== X-Forwarded-Encrypted: i=1; AJvYcCWT3Ctm9N9oToTHcrTmF8jte7jEUBaDoxUD4zSImogJo3rN6yHS7xeHQad/59WOQV0lBDpstOs=@dpdk.org X-Gm-Message-State: AOJu0YyDxDIOJ0Cjj/gYclcgxPtQ+T0nFT4HpatqxrST9xalCS9nyPMK 6MG6NlPgYcqFq2I6YbCbQLMDhwl1XnZInjEdVCyH9j9GEBVkoyT51resf7zE7IQ= X-Google-Smtp-Source: AGHT+IGBx8QM/QJG+RSKmzGZHlTOcpyBtyv+9n6JZWcDoHw1sfW4BACkPFFrgwlwNP/MDXdxXwIs4g== X-Received: by 2002:a17:902:d2d2:b0:205:8a25:904b with SMTP id d9443c01a7336-20b37bcf765mr104068755ad.57.1727542112289; Sat, 28 Sep 2024 09:48:32 -0700 (PDT) Received: from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20b37e47c7dsm28854015ad.216.2024.09.28.09.48.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Sep 2024 09:48:31 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , stable@dpdk.org, Konstantin Ananyev , Ray Kinsella Subject: [PATCH v2 08/16] bpf: fix free mismatch if convert fails Date: Sat, 28 Sep 2024 09:47:16 -0700 Message-ID: <20240928164814.861933-9-stephen@networkplumber.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240928164814.861933-1-stephen@networkplumber.org> References: <20240927204742.546164-1-stephen@networkplumber.org> <20240928164814.861933-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org If conversion of cBF to eBPF fails then an object allocated with rte_malloc() would be passed to free(). [908/3201] Compiling C object lib/librte_bpf.a.p/bpf_bpf_convert.c.o ../lib/bpf/bpf_convert.c: In function ‘rte_bpf_convert’: ../lib/bpf/bpf_convert.c:559:17: warning: ‘free’ called on pointer returned from a mismatched allocation function [-Wmismatched-dealloc] 559 | free(prm); | ^~~~~~~~~ ../lib/bpf/bpf_convert.c:545:15: note: returned from ‘rte_zmalloc’ 545 | prm = rte_zmalloc("bpf_filter", | ^~~~~~~~~~~~~~~~~~~~~~~~~ 546 | sizeof(*prm) + ebpf_len * sizeof(*ebpf), 0); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: 2eccf6afbea9 ("bpf: add function to convert classic BPF to DPDK BPF") Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger --- lib/bpf/bpf_convert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bpf/bpf_convert.c b/lib/bpf/bpf_convert.c index d7ff2b4325..e7e298c9cb 100644 --- a/lib/bpf/bpf_convert.c +++ b/lib/bpf/bpf_convert.c @@ -556,7 +556,7 @@ rte_bpf_convert(const struct bpf_program *prog) ret = bpf_convert_filter(prog->bf_insns, prog->bf_len, ebpf, &ebpf_len); if (ret < 0) { RTE_BPF_LOG_LINE(ERR, "%s: cannot convert cBPF to eBPF", __func__); - free(prm); + rte_free(prm); rte_errno = -ret; return NULL; } -- 2.45.2