From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D58EE2222B2; Mon, 23 Jun 2025 22:23:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750717423; cv=none; b=P/oUrr6otbtCaQPzsC1uBKPB5hWuC2X+goY394Bb5sJD2rzNPXvfCsHxltlkbL0njyvcn2/OcNs3ALa4p48x90ADbvF0HuR/ASM6riSE4MiHNcAZauoV3atWWOguNBM2IPCEATpAF9Dv2UTc+7cUUSOBUed3c4qTugbCzf2gYsA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750717423; c=relaxed/simple; bh=0+XSxnvBJIbGBy2RSXd+EIiLdrV14yDgI4LYxv/1Ewk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Gty0WmFss9E8J2QLpjKA4nzInPv+E4UZRMBOXanPxOZvLo5uCEYODm5lqBZlpOSnI0SUYYPlBUVUTZQeGZww6BLaFfz+2Wq+jDHUt2P/w5hA53vdzrV42dyARc2MWI7spFVo4c2DCAfVQBOhpH6YIXsrx675pbNu1zCf0WMnLyc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ew5IgMPY; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ew5IgMPY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B660C4CEEA; Mon, 23 Jun 2025 22:23:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750717423; bh=0+XSxnvBJIbGBy2RSXd+EIiLdrV14yDgI4LYxv/1Ewk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ew5IgMPYbrX520q29wFAyIGL9bR4CL1b9LswFCIOAiieEPnEQNYKD2aiHHgBJbFSZ NFJOT2dLXaXVpOuuQV09EEyXu+tW0Sgkk8Xdca6mFQ5D+5dxYrzKGG4+Xtv1n+czR+ aT2d8kiv2z7xxt4ZUDVGNtgppHPTB8orEHykFsuc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alexander Duyck , Jakub Kicinski , Jacob Keller , Paolo Abeni , Sasha Levin Subject: [PATCH 6.12 385/414] eth: fbnic: avoid double free when failing to DMA-map FW msg Date: Mon, 23 Jun 2025 15:08:42 +0200 Message-ID: <20250623130651.575392827@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130642.015559452@linuxfoundation.org> References: <20250623130642.015559452@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jakub Kicinski [ Upstream commit 5bd1bafd4474ee26f504b41aba11f3e2a1175b88 ] The semantics are that caller of fbnic_mbx_map_msg() retains the ownership of the message on error. All existing callers dutifully free the page. Fixes: da3cde08209e ("eth: fbnic: Add FW communication mechanism") Reviewed-by: Alexander Duyck Signed-off-by: Jakub Kicinski Reviewed-by: Jacob Keller Link: https://patch.msgid.link/20250616195510.225819-1-kuba@kernel.org Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- drivers/net/ethernet/meta/fbnic/fbnic_fw.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_fw.c b/drivers/net/ethernet/meta/fbnic/fbnic_fw.c index 7775418316df5..d6cf97ecf3276 100644 --- a/drivers/net/ethernet/meta/fbnic/fbnic_fw.c +++ b/drivers/net/ethernet/meta/fbnic/fbnic_fw.c @@ -127,11 +127,8 @@ static int fbnic_mbx_map_msg(struct fbnic_dev *fbd, int mbx_idx, return -EBUSY; addr = dma_map_single(fbd->dev, msg, PAGE_SIZE, direction); - if (dma_mapping_error(fbd->dev, addr)) { - free_page((unsigned long)msg); - + if (dma_mapping_error(fbd->dev, addr)) return -ENOSPC; - } mbx->buf_info[tail].msg = msg; mbx->buf_info[tail].addr = addr; -- 2.39.5