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 35C1E45A9D for ; Wed, 2 Oct 2024 17:45:09 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B0C9C40B8D; Wed, 2 Oct 2024 17:45:01 +0200 (CEST) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mails.dpdk.org (Postfix) with ESMTP id 3CA1D4069F for ; Wed, 2 Oct 2024 17:44:52 +0200 (CEST) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-71979bf5e7aso4995122b3a.1 for ; Wed, 02 Oct 2024 08:44:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1727883891; x=1728488691; 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=XsAhH0ZX3ddPj6j1bm6B9FX9Jp/gzrG8giI4aV5Q6Us=; b=qRz/NX2eMfj8Z5XIYEJg1/+Nry0d94CUfbOManEDNFWmgRISlR5py9+K8EuJ9eQgKh VMD0Z44HvP/+ImEVUo2vhHdl9Get6R81SII018T5ETi8qPjonqhlq9+vB9pUoBtj/KnB MvEQ16mJtVzh4aeVpsU6uZttuquVkIjbfXzSbhG6WtHSy/ybA7Gwny6ZXKUlsj4cFHM0 POCh7mUMGHZiZTZfIuDvPtYJZYPxCTe9HcaW38zhrSp0EzhwyHFtp+rxmm90BufpOQJ/ 7Laa7WiX6dhW8gxFUVLdvJD5H0A4lcMILhH/oi2stggwwSUWttN+Vpb+NBgYe5wrDUX/ mxZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727883891; x=1728488691; 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=XsAhH0ZX3ddPj6j1bm6B9FX9Jp/gzrG8giI4aV5Q6Us=; b=AY2wz9fNw7lt9gfy5HbywQLvhxhbFs82Xl3/WxOLdPq77ZuWlyRIx2mtVp1qN+ZC+B NlmnFLy9ChfYWDBt6wRrOyQ7p4b3PJOBZaL6CaqLI2AkofKS20pv5wbEvguE81fjdJls 4WWm1fAsQMnB1vU7SVMlTSHwPrgoYoCA+fSfGoAm8Jsu15H7xLOA4bZmv6L7+FkK+J8L Vo5b/22SurXbAnqvyWL/37FewoY7JgI5A4fGWhT+h4qgrCQM0E/PnawQbaB+5IMmGQnU U4hVM2ktQQaa5hPCBb5jOtyu4/zSwxQZhBWsyHIxYyIhqDKETg4n185UODnwDBhzBU1o mmqg== X-Forwarded-Encrypted: i=1; AJvYcCXPYrz7jtnJOSUz06ODm86EChX1gkklnSsClUxt7OxhjNajbEho1joyo7DINKxnNEdh7xMNHC4=@dpdk.org X-Gm-Message-State: AOJu0YxC10lguy5hAm2ntFVhTlxyK7fXC5YL5nFLDplSlHnM0Dp+Vl1z SUr6z0CcT3Q1MAA+iBgDk+JTcW9dWW3xQvSZciatW3XUJLdCE92Ft1E+92qmsts= X-Google-Smtp-Source: AGHT+IE5O3xgQ0qeMj54B6iQdoQv4GUUzE4ig77IyeG92pFN1bTSkaZxCsmkbMWWf+ydx/pikTG8Sw== X-Received: by 2002:a05:6a00:2e1f:b0:718:d8dc:308a with SMTP id d2e1a72fcca58-71dc5c6710fmr5961325b3a.12.1727883891416; Wed, 02 Oct 2024 08:44:51 -0700 (PDT) Received: from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7e6db2927c7sm10247363a12.1.2024.10.02.08.44.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Oct 2024 08:44:51 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , hkalra@marvell.com, stable@dpdk.org, Rosen Xu , David Marchand , Hyong Youb Kim Subject: [PATCH v6 14/17] drivers/ifpga: fix free function mismatch Date: Wed, 2 Oct 2024 08:42:58 -0700 Message-ID: <20241002154429.64357-15-stephen@networkplumber.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241002154429.64357-1-stephen@networkplumber.org> References: <20240927204742.546164-1-stephen@networkplumber.org> <20241002154429.64357-1-stephen@networkplumber.org> MIME-Version: 1.0 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 The raw ifpga driver redefines malloc to be opae_malloc and free to be opae_free; which is a bad idea. This leads to case where interrupt efd array is allocated with calloc() and then passed to rte_free. The workaround is to allocate the array with rte_calloc() instead. Fixes: d61138d4f0e2 ("drivers: remove direct access to interrupt handle") Cc: hkalra@marvell.com Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger --- drivers/raw/ifpga/ifpga_rawdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c index a972b3b7a4..86558c7b9b 100644 --- a/drivers/raw/ifpga/ifpga_rawdev.c +++ b/drivers/raw/ifpga/ifpga_rawdev.c @@ -1499,7 +1499,7 @@ ifpga_register_msix_irq(struct ifpga_rawdev *dev, int port_id, nb_intr = rte_intr_nb_intr_get(*intr_handle); - intr_efds = calloc(nb_intr, sizeof(int)); + intr_efds = rte_calloc("ifpga_efds", nb_intr, sizeof(int), 0); if (!intr_efds) return -ENOMEM; @@ -1508,7 +1508,7 @@ ifpga_register_msix_irq(struct ifpga_rawdev *dev, int port_id, ret = opae_acc_set_irq(acc, vec_start, count, intr_efds); if (ret) { - free(intr_efds); + rte_free(intr_efds); return -EINVAL; } } @@ -1517,13 +1517,13 @@ ifpga_register_msix_irq(struct ifpga_rawdev *dev, int port_id, ret = rte_intr_callback_register(*intr_handle, handler, (void *)arg); if (ret) { - free(intr_efds); + rte_free(intr_efds); return -EINVAL; } IFPGA_RAWDEV_PMD_INFO("success register %s interrupt\n", name); - free(intr_efds); + rte_free(intr_efds); return 0; } -- 2.45.2