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 99B7245A9F; Wed, 2 Oct 2024 20:41:00 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7FB2240B8D; Wed, 2 Oct 2024 20:39:51 +0200 (CEST) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mails.dpdk.org (Postfix) with ESMTP id 3828A406B7 for ; Wed, 2 Oct 2024 20:39:41 +0200 (CEST) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-71b0722f221so145684b3a.3 for ; Wed, 02 Oct 2024 11:39:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1727894380; x=1728499180; 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=qIOrQWk0MlDkeWwCd4gBF6Jfulhk2kTLHW+fwY96HDkVT2IcZALKIOXoYUe+OQ5a9u 7KJxU/KKR0x5FvEnhMtUQlAQ+FJ5bJBJj5pgChniczmLQxydLdM2nsW8A6t6XfXgyu64 Ee6SJ31eYC0sXUWGUAssXrVJBhzypKlblmor2FCirtIrXDtpXBU5CJFuN9woacYlugzJ RNpp9xeEQPKjp8cGrn6BR3u3lUAiXPtV1M3Pa7QiJqJUDXkd/5iHHsOJF9sf80ak+N48 vobDHmHkwOtJbJHVsIYg24Un1l2+9ob040LT2CuiRIt+JXxhIIcE4mqXB5nwOUN7UGuA GN8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727894380; x=1728499180; 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=MkVuAKRaG88Rmb0uIAmq5mqv2ngkNo0KvOh9AmNOAYLIEGDzBjrl/t1k5kSZw498jW kIRjFgJF3mAjK5aZpd9+35SZh8OIUge62YT6VI3P3KPfFiuCHdNgeEqLN61FktHiG898 4tFxyMD2zIMHXi8b9BXMqA84EtlihyuRAm7KuICitx+e2haY0GVm5mChqfgaQGIIwxUf 5URGDikBS15yAo1fBnzHFvDuu38GNOqdsqmMcCM9dEqsty/7r13Y0SPpAZNhE+YOpLpY f25S8gOdRRm0+Y1OE6UYu+Qs4Zcgv/BZspI/7mYjO/Enu/N1913w8Vh29cZBftRHhE4h VViA== X-Gm-Message-State: AOJu0YzbqpWW4JAI2+pMX8cdrIYYtpriZSrUgQjO7EFn8os8UwKCh/ph Nc9QqjN5UQFERd+oU8w/W7TO0vF0WeiKVNU+FLikzV97OxcR/xv71PJbn2T5spcXUbWEU+rakeL p X-Google-Smtp-Source: AGHT+IERN/5H4XGqNdGVIes3C/a3DXDiF6T3jip7hnhGh0jWklGSwPrJeQ99Rtjn9RWVPUk7ONgk7A== X-Received: by 2002:a05:6a00:807:b0:705:a13b:e740 with SMTP id d2e1a72fcca58-71dc5d6a157mr6050942b3a.19.1727894380265; Wed, 02 Oct 2024 11:39:40 -0700 (PDT) Received: from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71b2649b0bdsm10104362b3a.34.2024.10.02.11.39.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Oct 2024 11:39:39 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , hkalra@marvell.com, stable@dpdk.org, Rosen Xu , Hyong Youb Kim , David Marchand Subject: [PATCH v7 14/16] drivers/ifpga: fix free function mismatch Date: Wed, 2 Oct 2024 11:37:52 -0700 Message-ID: <20241002183918.161656-15-stephen@networkplumber.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241002183918.161656-1-stephen@networkplumber.org> References: <20240927204742.546164-1-stephen@networkplumber.org> <20241002183918.161656-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-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