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 797F445A7E for ; Tue, 1 Oct 2024 18:37:35 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0C608406FF; Tue, 1 Oct 2024 18:37:32 +0200 (CEST) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mails.dpdk.org (Postfix) with ESMTP id BACDE40658 for ; Tue, 1 Oct 2024 18:37:25 +0200 (CEST) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-71db62281aeso1279669b3a.0 for ; Tue, 01 Oct 2024 09:37:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1727800645; x=1728405445; 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=byw+T9aEtLmd9FRCPbUVPY84ECQQCfEomDbLkhZS/Uvemx4ajDacySOX9qhc9hmEa+ KneFQUGOb6o9r+ULsBDVrhIW3/LOIC9CGbGmCpz/MSEv42FTMTpAeCOWffZtnc63ni2Q 2+7km16UE6YBs9r5RSbRad+F98RSCXTaxMMFklO5DOohBbaLgT3kn1EuTlyy/AYkyL7Y bGDw8EARCnkQ7vz+JBPV3V45WbkalF3N2+WHyN7nWhBsI/aSQGxRH68Cvx3aHQwxIoHt Fwi4CrNRYIiec0H6kJm1IFtWqzrN1pMoQZubqJidIIR/nYCJM8XgETxjplFjB5ChYdJ+ rNUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727800645; x=1728405445; 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=pe8gM1+JyRQ8tjIs9oFXFndDzQuiL9aUIKiBgGg9lTqDB73oynObf6OYC3tbGnc77l 2lno8KTu0tLaJvn6ViikpMzHF0lwZ8GN4kYUsBOy0U5Z15G5sbu6efKqU6mg7Z5MDXF0 b3R4q7otS6Gof3l1vCw45JeLyL3GnvWDOiZGuU4y001KCfSa+U+47qin3tMOQ1vwqj9U d/dBwjPu+MJNdqFp31oda4ELPk7+EbKOBk2332rcOcDKByqddbWgxk76Flvn3zcIn8Hy NsKd/YLX5C9fDAZnXnxI//utIeS4cB0QOXtQNHBBk6FxN729UN6oqxNLTwiTsjQ4ePJO d8xg== X-Forwarded-Encrypted: i=1; AJvYcCWnFVjwSRhEFoQSeq8PPyHeCn3RCnAC57Ld73Z+DZevEIiwSGjxTDmagM0L0eQAOFjZo4i6wTY=@dpdk.org X-Gm-Message-State: AOJu0YwcF9+yGLQ585Y+002qQ/zAd7zQIiJq+b5WwNcPosuY1SObTWOK O4A9hP8EpG9Oq3wgW7Bc58bh1eav+mj5jJvLw8wZVDGBANF95cxZ0nMcr+gFfz0= X-Google-Smtp-Source: AGHT+IEIppF+QerOeyPPKOVe5uSls8PBHT1ZzgxpBHHRqBT7ere5OPT2+IfIiNMWg56M6tPPcDDBtg== X-Received: by 2002:a05:6a00:814:b0:70d:36ad:3f67 with SMTP id d2e1a72fcca58-71dc60c1909mr255499b3a.11.1727800644845; Tue, 01 Oct 2024 09:37:24 -0700 (PDT) Received: from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71b26518818sm8213565b3a.129.2024.10.01.09.37.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2024 09:37:24 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , stable@dpdk.org, Konstantin Ananyev , Ray Kinsella Subject: [PATCH v5 07/17] bpf: fix free mismatch if convert fails Date: Tue, 1 Oct 2024 09:35:30 -0700 Message-ID: <20241001163708.355128-8-stephen@networkplumber.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241001163708.355128-1-stephen@networkplumber.org> References: <20240927204742.546164-1-stephen@networkplumber.org> <20241001163708.355128-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