From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 256B41BC08F for ; Sat, 4 Jul 2026 03:32:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783135954; cv=none; b=Xk0q4c2/qUOjlg1XrmzlF1sktoGG5jcjvwape9iY9MMb8+W9nCt8Hfzi4D71IFwfuquHJMsFkVDreXXWM4Yt88YGNX0oZVf3S/7pouh539xYFfgaaN3qrDem+MqTcoaiOi0UCjxz7tb+o6t08OnHpnPQK4kJrljPm34Nnait7a8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783135954; c=relaxed/simple; bh=QQAbitMkQ0qBRMMilwe/GvLXplVQttu88olFEYFJdqg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ELjfYuLYpylAz2VN1NuCHUMKqvT/QtAHhYAkJOc/bMasAza6k2Y+OuoJmVn63Kg0jXW/+vBFL/Laf6Sd/tj8p1LV2Xy+RTspPRMnVYNDzMO4HKwrZutKFv8SjE2lJBj1g5gDWUBY/TjfD13/fZdCQMUuei9836G5kxIF7QoFUN0= 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=g3q2tUFe; arc=none smtp.client-ip=209.85.214.171 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="g3q2tUFe" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2caf4496889so3203405ad.1 for ; Fri, 03 Jul 2026 20:32:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783135951; x=1783740751; 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; bh=etYBcZKNvedguZcZzxJlv9Nayc7uz+fWkzLHt0ZOgn4=; b=g3q2tUFesZJA76leE/wv6vXOFXbA9urWhEjFBZlwNnZRONbeB/QJLpND3BOvMm2Bzb feOuQAF/Ryu5d/aw/Vir3dIRdEvToMctaGiVOMGeugoSwM+qfocQ/LMYDSBp2INP4BQw qaRG3s/CzyFuIBZSsB9QhSR9A+PcFAFlzx8bAjSH2bkMY/DWjRCvfW3/5tulb1nEkKFW WLxz+pw2s4wZpedVl62XXhDNtQUNR0TD/kwiRl6bQCNb6nQjs52frcK8dxG+6WOdNPm7 +Hpg2wJLefdlVpJkdYiJc5tNMk1MJZSf8Es1kcBCahD1fuUfmGVMjWO16tH6teiR4T23 5Wtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783135951; x=1783740751; 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; bh=etYBcZKNvedguZcZzxJlv9Nayc7uz+fWkzLHt0ZOgn4=; b=nwXATGWFQrQ/MFZFqEKrdhfyk+hojWV9A5yqQkX/12jX4BNn+yB/bGkUWCnvh/xbT+ m1RvMXEnqJYYHxwKv8+dYA/S3r3pG6ogDpPERGTlQIltZKlBdhAjqmoGVh23jf7XLUlT Xx2GTLCPyjsAFRNbl+ldwcNie4nha9Iz6tggdwBzLMgsVxxzpaKvoLX9PeittBsjrkV2 nhmk3h4jNgLBPtl/o0n9bXwoCXceXUczWcn7W8I5aM3wVDiS+Jxjc371HK8AUyOO2kka +3fG4b+8gtxZY0qEfRIq6Uv/TpYYqlVXODRdR/zEPs9M6BYKuxJuDa2Gxu5/1/eemXbn bvUQ== X-Forwarded-Encrypted: i=1; AHgh+Roa42FH1PBbJRhzhsDbED01mDDA+O2+vVcL6gEX1ZUBmgMEsdtJkvwXiI3Ba7pMgQT+/bMqlgY54/iLwbs=@vger.kernel.org X-Gm-Message-State: AOJu0YwUj7hXJl2kwkCpAsyuqKoi5615dCTC1+SOocHw6PmGMw0Wpdry sY2N0au0f0Tlz2LNVPDVnqR+pr9oekxhitUQSgJqlaugUI+0APqZrDI/ X-Gm-Gg: AfdE7cl2oJGobtesjEColk/Jo/J8uy+gA3ZOCqf3Hct24TewqOWhis6n4zhSsMfFbx8 t7TPz3lZ4TkWriFwLAjn08/MTPGwYPzAVqF8icB56r/wim6sTgEGf8b1tvguDK/W9II9eylbWhp JgQ67ryJf35SujorRZ4WnxfL3ATvyGTFuDjxB7fe4UjFjXQ+Sv5rLRvLMvmljgOt1rG1UnG/QAd ID6HGidzltlotR1wsdGqUzrKBTwOScIrMh/H41Z2ze9CW/Pa2nr0nCngJpd75PJZ5LKPmT9u02S 7rTx3aUFLyDY38OrRU/1iY/KAAlqX6chPoH/7NUPKO0JvC2hyUp7bZcvp+maxOp78KSWNspCrhP yDldomRoaa4i4kwpRNjBDadYc8N642N//nyvD8r//ume6DBExnXqZIlAac8XbFEFs8hc8e5eKC0 cM1I5OBKYyIPhZxWsMA/6qIce4DiIwawa4+jX7KMnVZIXoVQExspAowDkD6SkU9gF3nszhXW06m QpmUYmZXg== X-Received: by 2002:a17:902:d4c1:b0:2c9:b42e:444e with SMTP id d9443c01a7336-2cbea1a3905mr12865425ad.1.1783135951228; Fri, 03 Jul 2026 20:32:31 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e34]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cad6f25f7bsm17448625ad.7.2026.07.03.20.32.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jul 2026 20:32:30 -0700 (PDT) From: Rosen Penev To: netdev@vger.kernel.org Cc: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rosen Penev , linux-kernel@vger.kernel.org (open list) Subject: [PATCHv2 net] net: emac: mal: replace devm_request_irq with request_irq to fix probe error race Date: Fri, 3 Jul 2026 20:32:29 -0700 Message-ID: <20260704033229.2447410-1-rosenp@gmail.com> X-Mailer: git-send-email 2.55.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 devm_request_irq() is a managed resource: the IRQ is not freed until devres_release_all() runs after the probe function returns. In the probe error path, free_netdev(mal->dummy_dev) and dcr_unmap() execute while the IRQ is still live. If the shared IRQ fires during cleanup, the handler accesses unmapped DCR registers (crash) or the already- freed dummy_dev (use-after-free). Switch to plain request_irq() with per-IRQ error labels that tear down only the IRQs that were successfully registered, and add the matching free_irq() calls in mal_remove(). Tested on Cisco Meraki MX60 Fixes: 14f59154ff0b ("net: ibm: emac: mal: use devm for request_irq") Assisted-by: opencode:big-pickle Signed-off-by: Rosen Penev --- v2: rebase and add tested comment drivers/net/ethernet/ibm/emac/mal.c | 43 +++++++++++++++++++---------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/ibm/emac/mal.c b/drivers/net/ethernet/ibm/emac/mal.c index e88e4a1ddcd4..b42ba53671fd 100644 --- a/drivers/net/ethernet/ibm/emac/mal.c +++ b/drivers/net/ethernet/ibm/emac/mal.c @@ -656,26 +656,26 @@ static int mal_probe(struct platform_device *ofdev) hdlr_rxde = mal_rxde; } - err = devm_request_irq(&ofdev->dev, mal->serr_irq, hdlr_serr, irqflags, - "MAL SERR", mal); + err = request_irq(mal->serr_irq, hdlr_serr, irqflags, + "MAL SERR", mal); if (err) goto fail2; - err = devm_request_irq(&ofdev->dev, mal->txde_irq, hdlr_txde, irqflags, - "MAL TX DE", mal); + err = request_irq(mal->txde_irq, hdlr_txde, irqflags, + "MAL TX DE", mal); if (err) - goto fail2; - err = devm_request_irq(&ofdev->dev, mal->txeob_irq, mal_txeob, 0, - "MAL TX EOB", mal); + goto fail_serr_irq; + err = request_irq(mal->txeob_irq, mal_txeob, 0, + "MAL TX EOB", mal); if (err) - goto fail2; - err = devm_request_irq(&ofdev->dev, mal->rxde_irq, hdlr_rxde, irqflags, - "MAL RX DE", mal); + goto fail_txde_irq; + err = request_irq(mal->rxde_irq, hdlr_rxde, irqflags, + "MAL RX DE", mal); if (err) - goto fail2; - err = devm_request_irq(&ofdev->dev, mal->rxeob_irq, mal_rxeob, 0, - "MAL RX EOB", mal); + goto fail_txeob_irq; + err = request_irq(mal->rxeob_irq, mal_rxeob, 0, + "MAL RX EOB", mal); if (err) - goto fail2; + goto fail_rxde_irq; /* Enable all MAL SERR interrupt sources */ set_mal_dcrn(mal, MAL_IER, MAL_IER_EVENTS); @@ -694,6 +694,14 @@ static int mal_probe(struct platform_device *ofdev) return 0; + fail_rxde_irq: + free_irq(mal->rxde_irq, mal); + fail_txeob_irq: + free_irq(mal->txeob_irq, mal); + fail_txde_irq: + free_irq(mal->txde_irq, mal); + fail_serr_irq: + free_irq(mal->serr_irq, mal); fail2: dma_free_coherent(&ofdev->dev, bd_size, mal->bd_virt, mal->bd_dma); fail_dummy: @@ -720,6 +728,13 @@ static void mal_remove(struct platform_device *ofdev) mal_reset(mal); + /* Free IRQs before freeing resources they access */ + free_irq(mal->serr_irq, mal); + free_irq(mal->txde_irq, mal); + free_irq(mal->txeob_irq, mal); + free_irq(mal->rxde_irq, mal); + free_irq(mal->rxeob_irq, mal); + free_netdev(mal->dummy_dev); dcr_unmap(mal->dcr_host, 0x100); -- 2.55.0