From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) (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 5C700314A8E for ; Mon, 3 Aug 2026 14:36:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785767785; cv=none; b=m3KyeP62heGKagl/IfHTmAsgOIscMHATlGDsTctBLgWfVghx6cmHXo6Pdv22Fs1BGuOJ61g5Usao4ksdSE1e8Ct2xe51O1tP/SXg7khUBeiiIuMP0k2Lq44OgY0vdqJQudJUj2hv9r6Qosq3QIP+ANsH+DnSWV2Kbp5iWpuMSIM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785767785; c=relaxed/simple; bh=GFFC126DJy54L91aVHwJFsFbycvYP2zw6dY1MoOwNo4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=L+/xKCVhaOSRHqzDVDoi4+tChs8o6YC5Lam9lCtQXVuJFW/dGnJ2udLE1HWFr4qJChF2SlaX5fgIewCFpYkAwAaZAhT8Ixinp4hAeZDfwp8ELf/wtjsQiPttga9I09voKNYd3aJWZ+G1jQ/O6fLDkfFYzkKsY/ZV0xr9wQjqQ0s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=VsmBIaKf; arc=none smtp.client-ip=209.85.221.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VsmBIaKf" Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-46f88060e8dso231487f8f.2 for ; Mon, 03 Aug 2026 07:36:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785767781; x=1786372581; 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=6NEy/PUFP4IYziRxlFsuxGJ+UKXD+3O9hbIQf+7B02s=; b=VsmBIaKfislYVJhGN8ID17zJC76vr6noyXUGkxQW/08MbMPf1Mco2U9Ziagv8oiZC5 8zk9lj2TJWOpq4gHa8jh08Pu8kh2YruOMKv8uWpiHxUztaG14UPdCtJOGQ2+pQNFUyeK UAOHzAu942CrtyMLN5gR01lNUlDxOwJVmQW0dnTV3qBWdX8ILPq7q/IUMSHIKI775enV lCGB3R4NsyZ2lOiPJ4+ozkY3d7SS2Fp4LuRwSad/quuH+O0JGAzIfgqn+tIMD4H7d5Do hDN+4j5zDKAoDtC1z7LfIy6frV3op9B4RuIWnvFMxIN5LrdzZ7xEpMrj/GEgJ9zql6To sW0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785767781; x=1786372581; 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=6NEy/PUFP4IYziRxlFsuxGJ+UKXD+3O9hbIQf+7B02s=; b=aDPfIbljkXerR09ZS4jOxZW9c8ALLZBvru02vRpwyOZRJ7kMABTc0USu+6J8qRYKCX QWlbUNKj2/oe1p1jIrERlGhcWhZM7WLX1sDjQxtUIzTWJBqzD7qAXwO5R5l19/s/V9Q0 PEa/psBeYnnLVVLJJqvFt0GlcV/N7WIiAkfX2E5BP4WwZpAoxHAdPUHjoPkRSBVqENMo GYmlFHigZpYBZKrWuseKeDBbV5NclO8FoewjFK+r9Bx/SGjptjbRjELSOU+jFqegKddK OFpVm2kpRWEN20TdPS7C543EnZvKTB3+jrLsu+Nd5MA8gVgoqoKby4RF+4solVk7OT3p 87gQ== X-Forwarded-Encrypted: i=1; AHgh+Ro1NqlRWARC328J5iBsM4aHUO380SiE9eFUQyWRXEvfT+HuVZZDabC9PDmCFitVIBTmEVyODZxmseHxosI=@vger.kernel.org X-Gm-Message-State: AOJu0YyL6LTGtRzkC23Ydw8yknt0fCAo7PHFlgwVNcaum8bhnJwUGbKN ZC1pdEZKCIonGP+ZuX2ovwRFHLiIJvRUr/nhATdupl9kCBwtjJF/xL35 X-Gm-Gg: AR+sD11s2nCpEBDGMW3n/xRwHZsxrW/1fih2xo4ikaOZ0Km1E/IoG0FZa79ma6Wvl6J KqD/UzrVjEAfEvc5nNGDPGSDuMU5Ar0Q11pjBa/g5u4iJGHn+tOku5wgYEpIcUeBUNEYuGFC7V5 M30MkAc/5873dd2B85KytEuJqRBCD2f2/v7Wda7V/GTtX/MxTL2ZH2Q6Whdp4q7U+jS7Vwzgfi9 qHuAI0LAihFERtkLJw+p5wO07sWYx0t1Q4NkbdpNlbFc9Qv+E6/nFiP2OYMD+dGLn/3msihPrNt raV6B0a+XK1VMqG1lXPNyX4kKD2vC1eRrndJudajMJ6cOynl5mr7mwhUDiZwYHQtNRZNf1VSU50 RMjHq3A64533j1xrGL8A/kseiN3RUEdmTwof8g0Kn05OAx6EByShQeIlrhZPcWV4zqiHLE1XpJy diIbpURCRB+sGwh8bCcG7tgs94mpMriQuQyD/mJz4XeQmhgjDWm1AqZ+u0idDUkiekCSPAV8X79 eFuei6b1c8+IA== X-Received: by 2002:a05:6000:382:b0:47f:946b:d3fc with SMTP id ffacd0b85a97d-47fd72e31eemr14371381f8f.2.1785767780705; Mon, 03 Aug 2026 07:36:20 -0700 (PDT) Received: from thomas-precision3591.. ([2a04:cec0:101e:c128:c461:1b2d:86b8:e437]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-47fd41cfdc6sm32663260f8f.8.2026.08.03.07.36.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Aug 2026 07:36:19 -0700 (PDT) From: Thomas Fourier To: Cc: Thomas Fourier , Felix Fietkau , Lorenzo Bianconi , Ryder Lee , Shayne Chen , Sean Wang , Matthias Brugger , AngeloGioacchino Del Regno , linux-wireless@vger.kernel.org (open list:MEDIATEK MT76 WIRELESS LAN DRIVER), linux-kernel@vger.kernel.org (open list:ARM/Mediatek SoC support), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Mediatek SoC support), linux-mediatek@lists.infradead.org (moderated list:ARM/Mediatek SoC support) Subject: [PATCH net] wifi: mt76: sdio: Fix possible data race when dequeuing skb Date: Mon, 3 Aug 2026 16:35:08 +0200 Message-ID: <20260803143510.49558-2-fourier.thomas@gmail.com> X-Mailer: git-send-email 2.43.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 The next entry of the queue is saved as a refenrence and immediately removed from the list, before processing the skb. It can thus be overwritten by the queuing function at the same time as .rx_skb() is called. Split mt76s_get_next_rx_entry() to get the tail, and once it is processed, pop the element. This patch was compile-tested only. This patch depends on commit 16254fc51f7d ("mt76: sdio: fix use of q->head and q->tail"). Fixes: d39b52e31aa6 ("mt76: introduce mt76_sdio module") Signed-off-by: Thomas Fourier --- drivers/net/wireless/mediatek/mt76/sdio.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/sdio.c b/drivers/net/wireless/mediatek/mt76/sdio.c index 8bae77c761be..12ee781a62f4 100644 --- a/drivers/net/wireless/mediatek/mt76/sdio.c +++ b/drivers/net/wireless/mediatek/mt76/sdio.c @@ -371,14 +371,21 @@ mt76s_get_next_rx_entry(struct mt76_queue *q) spin_lock_bh(&q->lock); if (q->queued > 0) { e = &q->entry[q->tail]; - q->tail = (q->tail + 1) % q->ndesc; - q->queued--; } spin_unlock_bh(&q->lock); return e; } +static void +mt76s_clear_next_rx_entry(struct mt76_queue *q) +{ + spin_lock_bh(&q->lock); + q->tail = (q->tail + 1) % q->ndesc; + q->queued--; + spin_unlock_bh(&q->lock); +} + static int mt76s_process_rx_queue(struct mt76_dev *dev, struct mt76_queue *q) { @@ -397,6 +404,9 @@ mt76s_process_rx_queue(struct mt76_dev *dev, struct mt76_queue *q) dev->drv->rx_skb(dev, MT_RXQ_MAIN, e->skb, NULL); e->skb = NULL; + + mt76s_clear_next_rx_entry(q); + nframes++; } if (qid == MT_RXQ_MAIN) -- 2.43.0