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 C3EC81292F3; Tue, 23 Jan 2024 00:11:51 +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=1705968711; cv=none; b=UeXobbfj1El08VIWGdAUJAQRNekHOlteHNiPFybUOrTtD/ttUeLm8DE/SqizZ4iTqfBdZ+EmL8v7SS9idg8uFCdh/j365wKAG0/Kc+4Da1nMqm8wtg22BtpSAcGAdTuXS84VBunvGsqqjJLPy9Ph6gpTf3JrweJ2gn3Hwmi29I0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705968711; c=relaxed/simple; bh=X5qPIaGfMq3BO2Is1GUnhWO0rl3oPKJln2YgzUFL1iA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=bGtLNObgMYp6UdG3Qm6fwZBnVkhD6rMO6FIq3oDKnsLQ00fXbIFJDM21RQBinrI45wdHRAc1GSCUFaIMAcem1Ays2DaFy0zir+SHBKFs91oB2dQ5QzyPsK1Skch/KOq/y72b3mDUDlnutp4+N424df1XAmUtNk80B0DcNmBMuoY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=uOvznF7E; 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="uOvznF7E" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7F7E3C43390; Tue, 23 Jan 2024 00:11:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705968711; bh=X5qPIaGfMq3BO2Is1GUnhWO0rl3oPKJln2YgzUFL1iA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uOvznF7EERJF1phu7vUpkye1+gIwAyCDAGKls+vv0Kb6IrXXg1oo1A3is3JlIF1lF k94wbVyG0xU2sCI0LHBdT2T0fmdIZUnqaO50OHHflcWEXsDGDcezN+2aNgaO2Alx3Q ZrmjzvPtFFXlD2kBI7qbOFFLCn4Ozs/4db95zhes= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Nikita Yushchenko , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Sergey Shtylyov , Florian Fainelli , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 140/148] net: ravb: Fix dma_addr_t truncation in error case Date: Mon, 22 Jan 2024 15:58:16 -0800 Message-ID: <20240122235718.253411001@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235712.442097787@linuxfoundation.org> References: <20240122235712.442097787@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Nikita Yushchenko [ Upstream commit e327b2372bc0f18c30433ac40be07741b59231c5 ] In ravb_start_xmit(), ravb driver uses u32 variable to store result of dma_map_single() call. Since ravb hardware has 32-bit address fields in descriptors, this works properly when mapping is successful - it is platform's job to provide mapping addresses that fit into hardware limitations. However, in failure case dma_map_single() returns DMA_MAPPING_ERROR constant that is 64-bit when dma_addr_t is 64-bit. Storing this constant in u32 leads to truncation, and further call to dma_mapping_error() fails to notice the error. Fix that by storing result of dma_map_single() in a dma_addr_t variable. Fixes: c156633f1353 ("Renesas Ethernet AVB driver proper") Signed-off-by: Nikita Yushchenko Reviewed-by: Niklas Söderlund Reviewed-by: Sergey Shtylyov Reviewed-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/renesas/ravb_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index d70c82c926ea..3cfcc9e3c35d 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -1508,7 +1508,7 @@ static netdev_tx_t ravb_start_xmit(struct sk_buff *skb, struct net_device *ndev) struct ravb_tstamp_skb *ts_skb; struct ravb_tx_desc *desc; unsigned long flags; - u32 dma_addr; + dma_addr_t dma_addr; void *buffer; u32 entry; u32 len; -- 2.43.0