From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f170.google.com (mail-qt1-f170.google.com [209.85.160.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 02649376A19 for ; Tue, 11 Aug 2026 19:27:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786476430; cv=none; b=KW7krOZo57JFjakVYC/8BszU384PpuuYo3N6xTwbTIJdenZnAQ9wPymPKdPwZO5QQOhGcroDkB+Ntgtfi/8NSpGMoijQe+xlCABlG50S6TUc/TT0Dro09LqUqo9lcJUhAygc8zsEp93t9Q7q9jA/phH4RfKskgQ5PXYVziYHt3c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786476430; c=relaxed/simple; bh=BMOKZKEeinEKCN0a9DkPEKX4u006R4NgANwevX5X2V0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=sBt3bw+uSzyqBrVe9ojo2p1WeRWbKvz2+KLIRDLhF1DE+Am7RbstOCch0LP0Bo25MoYGdWvH/hplo/2/a5BnKm1gSgbVs54OFngT8uGVBC7WKq9SXzYOPaba/7uqGoXmyJd/D0dVK8Kfnoj9si89mhzPJm5nQ3RiJfOoS7krn6w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=riscstar.com; spf=pass smtp.mailfrom=riscstar.com; dkim=pass (2048-bit key) header.d=riscstar-com.20251104.gappssmtp.com header.i=@riscstar-com.20251104.gappssmtp.com header.b=RLD92B7v; arc=none smtp.client-ip=209.85.160.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=riscstar.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=riscstar.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=riscstar-com.20251104.gappssmtp.com header.i=@riscstar-com.20251104.gappssmtp.com header.b="RLD92B7v" Received: by mail-qt1-f170.google.com with SMTP id d75a77b69052e-51c4436d02cso2182301cf.1 for ; Tue, 11 Aug 2026 12:27:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riscstar-com.20251104.gappssmtp.com; s=20251104; t=1786476428; x=1787081228; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=8CJ6QNSqhWJGSffyTY/ffGanQulWe1yCj+00GIgVmXg=; b=RLD92B7vPW2lv9HbX5Ne64QIf5a/hKhGz9MA1vRoE3Mi2BqEt1CU/AYuOk444YFX/r Wa9Uv4CdnWOo3NGk9q5rjNooLubNw9jowbCjZWhbwRw5S62euK/3a9KtlaSJpNTB/aD1 P6+zbtahUghJYZWBIs4VV4zQiIYi3eFejRyimUKmnfLGSla22xSjddykWkwgUy6kZS0C J8canVLH+iURb+KhNaUOY+0Zemm7XG7UwSJDyUeFRooLu747qhz8ocIL/BgvcJuc4s9w dUeWKBf+rd6tju2gSZDd10UY3rUxPb4D+QK2fFLjrDGweRk8cBz1YA6z74kNH5KdSTAP 0vAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786476428; x=1787081228; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=8CJ6QNSqhWJGSffyTY/ffGanQulWe1yCj+00GIgVmXg=; b=pm51iuRN0GkijFgXaAVjs1QFP+aREZCrbA+jHT03GRgZevR+Q9vLRk1lb9HIH1N9TT ETA+Thc4xTLEwbIQvVw9c8K8K5DMemj59IvS3Rk7+wpF2gnWJdfCTgosyxN2BYysh1uw cuCaJY/KhcwLEuyLmMT1aCaDm5OjXBZ+x7biL17N3UX81JvuYdPf7HWYTmoc7+ZORK3N GoUKYq9CBBOM7mhnFalwZxoyVcdsaa1bNQFJVYnxQ73c9LF0Ib5dlhUpdLpSdo7r7Mty nLwNmWst04LUajwNvQc6Igjz4MGU8ijgE9neiND4ZCzf5bHqQZU1FrEIfY6sD1hzRYMR 2AYA== X-Forwarded-Encrypted: i=1; AHgh+RpqdheikpHcQHcn0joKeUCjukLIbymGIC0ybiNbsVZ8achB5HgN5E3KAkuIN4XpE7J0ZZoAaKrf2o052p4=@vger.kernel.org X-Gm-Message-State: AOJu0YwgjX52J0t/lpmONHUJUtnlJ8L71KV84H6UtFo1jwqqDs6f9ssX AFm98pifA6szKQ7yntAyeOJ0NN3bliexvSjc3447VOvvTNPonkFaqCJtiqtTIMNr1YQ= X-Gm-Gg: AR+sD128qUJOPbN20HXd6Aob66PrJ4IEBOqfW0hAKPMrqAFYRCkmqclcQ9g9DUV+ZfW FgGrO0pFtyTCpbPgGHode3IB2lQ4ioDdCFtj/FcER7bU1wFmqQj3HYo5LnzOplW13KiM1OxXCTJ XAAsuucAW4Qds5IiWGHs1mqqUiTXa8DjTO6vaaqg0p82+n4S2aEV65pXuDtD+9mlmAYV3RRkiX+ w/2S7WVLValYb1qdBXbIF7EYRY/36EveFQQcr8sQR1xNwasNn3HRcM5EFcdn7zn0B4KZ/GleTQU F1CCjzRrUmgBIQhBA7+ysfHOxVdvF6s5auAvlwFyJJD93WdcECC1aXys9E2aXoGomJEH3Z3vzlo DW3c0xe+ujdAXQeWcmv+Fhj6iE+ZA0znrhVEFN7uYJUI6epT86P7neoDW90aK18RltF4z22NAcm QB8jG74fSGMxYijXqBICEMi/90SQwfc561Qpu7UtLsw9nOmJxZE9wZ22sqYuQb+lbv22vbqLVIR /Y= X-Received: by 2002:a05:622a:5592:b0:51c:22c5:daf4 with SMTP id d75a77b69052e-52d58614af4mr54547001cf.28.1786476427825; Tue, 11 Aug 2026 12:27:07 -0700 (PDT) Received: from zippy.localdomain ([73.62.185.64]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-52d61a399c8sm3228451cf.0.2026.08.11.12.27.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Aug 2026 12:27:07 -0700 (PDT) From: Alex Elder To: maxime.chevallier@bootlin.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, linux-stm32@st-md-mailman.stormreply.com, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Sashiko Subject: [PATCH] net: stmmac: use dma_addr_t for DMA addresses Date: Tue, 11 Aug 2026 14:27:02 -0500 Message-ID: <20260811192703.1765416-1-elder@riscstar.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In jumbo_frm() (implemented in both "chain_mode.c" and "ring_mode.c"), an unsigned integer local variable is used to hold the value returned by dma_map_single(). On systems where a dma_addr_t is 64 bits, the subsequent dma_mapping_error() check of the returned value operates only on the low 32 bits (whose high bit won't be sign-extended). In this case, dma_mapping_error() would return 0 (no error) even if there were one. Fix this in both spots by using a dma_addr_t for the local variable. Reported-by: Sashiko Link: https://lore.kernel.org/linux-devicetree/20260606010122.21A211F00899@smtp.kernel.org/ Signed-off-by: Alex Elder --- drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 3 ++- drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/chain_mode.c b/drivers/net/ethernet/stmicro/stmmac/chain_mode.c index fc04a23342cfc..ec25193d287bb 100644 --- a/drivers/net/ethernet/stmicro/stmmac/chain_mode.c +++ b/drivers/net/ethernet/stmicro/stmmac/chain_mode.c @@ -20,9 +20,10 @@ static int jumbo_frm(struct stmmac_tx_queue *tx_q, struct sk_buff *skb, unsigned int nopaged_len = skb_headlen(skb); struct stmmac_priv *priv = tx_q->priv_data; unsigned int entry = tx_q->cur_tx; - unsigned int bmax, buf_len, des2; + unsigned int bmax, buf_len; unsigned int i = 1, len; struct dma_desc *desc; + dma_addr_t des2; desc = tx_q->dma_tx + entry; diff --git a/drivers/net/ethernet/stmicro/stmmac/ring_mode.c b/drivers/net/ethernet/stmicro/stmmac/ring_mode.c index 78fc6aa5bbe95..664d8cfb58cdc 100644 --- a/drivers/net/ethernet/stmicro/stmmac/ring_mode.c +++ b/drivers/net/ethernet/stmicro/stmmac/ring_mode.c @@ -20,8 +20,9 @@ static int jumbo_frm(struct stmmac_tx_queue *tx_q, struct sk_buff *skb, unsigned int nopaged_len = skb_headlen(skb); struct stmmac_priv *priv = tx_q->priv_data; unsigned int entry = tx_q->cur_tx; - unsigned int bmax, len, des2; + unsigned int bmax, len; struct dma_desc *desc; + dma_addr_t des2; if (priv->extend_desc) desc = (struct dma_desc *)(tx_q->dma_etx + entry); base-commit: 31397cf1819210bd63fa3d2c7d8c24f7c8667d99 -- 2.53.0