From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
	by inbox.dpdk.org (Postfix) with ESMTP id 89F9845AE3
	for <public@inbox.dpdk.org>; Tue,  8 Oct 2024 17:43:46 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
	by mails.dpdk.org (Postfix) with ESMTP id B2D6040EE4;
	Tue,  8 Oct 2024 17:43:34 +0200 (CEST)
Received: from mail-ot1-f53.google.com (mail-ot1-f53.google.com
 [209.85.210.53]) by mails.dpdk.org (Postfix) with ESMTP id D3D7A40E1E
 for <stable@dpdk.org>; Tue,  8 Oct 2024 17:43:24 +0200 (CEST)
Received: by mail-ot1-f53.google.com with SMTP id
 46e09a7af769-710de2712eeso1955906a34.3
 for <stable@dpdk.org>; Tue, 08 Oct 2024 08:43:24 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1728402204;
 x=1729007004; 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=jufL1Xx6Vcy1vUxL0AdrUCYAgWJlHW3xe3BF1P60Ueg=;
 b=QOWpHF68VSFJNw+HaOwbyuUPwqzI47OKg/r0uKiUHtPVlOjRbmI3WRqNSvNNM7M+Ic
 iOhzN6j4t2M3PnbHIdZKvzHAX2MvTd5v2rcj2PlfDpKZq82T4EE5nnCgrAgglep3TcQc
 TgHhjId1McF6ccGes5/+BTzGjRi6vhc4vNJiIrhQ0J+/cP0JUmlSrNUry3IwrKE4+RSC
 b2zdA3Lx/GeWjZImT08dWUGLBPVHxHaOdjOiM4IpMgslRREULwCSein+KYPTMpgTujOG
 mDv4V9p6pnvA+gTgvYcAAyU2B7D0xfRJu9+LLG9NGONZaT3DzwjDP4mGyHsPzPkF4yvo
 m1jQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1728402204; x=1729007004;
 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=jufL1Xx6Vcy1vUxL0AdrUCYAgWJlHW3xe3BF1P60Ueg=;
 b=eOak2yl1ULFMbdwa9IixVJZYTX8N1exKAHFRIvgsnMZHjYJoa4e4959JMqftaRgz1L
 SIyFbhYGsC2z7A7JmyqV2ToqbUOgs5UJtoEKcunoEm991FUVmfnq3RADRnRvAeFcuDLT
 pH2hSfSUrzB26zUAfVxidHBJtS5LyKT6Nr8aRGYXWa9jjUUsKZvO/yQZYbNettWydrVz
 uwm/dkZT45OBDp9qMRN7ofxzHHM9Yzc3Vi3UXate3HgywrZp1R4m4TlKvf5D8x9X/taz
 V6Ju4l5uo09/nNhB3xhMOW94kPt93nk14TBozMZKA2zzrbCtk2YqNILfB+Pn+HcUoQOC
 tscw==
X-Forwarded-Encrypted: i=1;
 AJvYcCUIsvTDxJxSV20e+JnbGGrorRY+QKmYq1qh5UeJvxHrNC6n3J1QUQKdyZaxJWzODTx17WlxgmA=@dpdk.org
X-Gm-Message-State: AOJu0YyjqZ5X7cx+2kX2dZc1kQyQt5o8Xsv+A44jD5MJImizf0xymG88
 XyvYl9hjitBD980ANu2G4FVj7IRkd2TzWQUnGsZsGsouZgNcBdWLmPtPm/MfL0g=
X-Google-Smtp-Source: AGHT+IGWNzWKhAlmyx51HYG1WymJBGPdA1wl17GLZQsZ0MCOMkbxmBWvGIPC4BCRZikvjb5pi118jQ==
X-Received: by 2002:a05:6830:6784:b0:710:edf8:d054 with SMTP id
 46e09a7af769-7154ea86254mr11263314a34.31.1728402204200; 
 Tue, 08 Oct 2024 08:43: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-71df0ccf01dsm6293527b3a.70.2024.10.08.08.43.23
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Tue, 08 Oct 2024 08:43:23 -0700 (PDT)
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>, hkalra@marvell.com,
 stable@dpdk.org, Rosen Xu <rosen.xu@intel.com>,
 Hyong Youb Kim <hyonkim@cisco.com>,
 David Marchand <david.marchand@redhat.com>
Subject: [PATCH v8 14/17] drivers/ifpga: fix free function mismatch
Date: Tue,  8 Oct 2024 08:41:44 -0700
Message-ID: <20241008154301.66192-15-stephen@networkplumber.org>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <20241008154301.66192-1-stephen@networkplumber.org>
References: <20240927204742.546164-1-stephen@networkplumber.org>
 <20241008154301.66192-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 <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
 <mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
 <mailto:stable-request@dpdk.org?subject=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 <stephen@networkplumber.org>
---
 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 113a22b0a7..5b9b596435 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", name);
 
-	free(intr_efds);
+	rte_free(intr_efds);
 	return 0;
 }
 
-- 
2.45.2