From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) (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 715E02F3C13 for ; Thu, 18 Jun 2026 02:34:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781750065; cv=none; b=YnNDLmZvmqiRmGfdFkaisIVXagpenM8fKzfxs37H+wE/fcaLJ3QWGY+4S/aLk8gpYjGAj5SlODrzddsNrhtyT2ZZjUeqrWWgsNpqEFHa76q1T0UARmVqMjruHp/xkfQyVwY7iOzES8/AKZrPg+9GYgDo07or0pCMsWZ6jT1bn74= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781750065; c=relaxed/simple; bh=fUmEeA7dGAXkLEe9ohOlEVhHOmdriGi59MTCsd/DUY0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=S0Cw9kbLPtz2Be/Gk0889lMG29RFVW3lnC3OtyN25Rgdgemh1p8Lv9HGcSBUFTAUNzE3To1FgiZKgyVpL1GfZZEBjgf+R1eM3w5oMjMU24v/IqGBBgIW49PKnZNpZhxynNKXNfLSuo9jxuNQblOC8tGYKcutKsEPA1G5VUOMIag= 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=CXlqLg61; arc=none smtp.client-ip=209.85.216.41 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="CXlqLg61" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-37cbcf49deaso163272a91.1 for ; Wed, 17 Jun 2026 19:34:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781750064; x=1782354864; 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=rFTRihsb4A12HPbEPFddMGd3EZlcBtB3kSw8HdT0K2I=; b=CXlqLg61cf4NBk8o06sA4SocWFqV0zohPDrg1bfX5C1CMZ/7O04lbJkvhT6a8tZqer n0T2WJG8RqTzcaiwEhvP0iuOjEEhwWCqE1ApXw/NaImOoAqsj+y70D4ebudDWXj5aFtU NFvvQW5+ABREpWs9nfQNfkY8UOBRCD2DONhBAFyxUI1zMTuOrzpBcLr6hsZCJM4NT/0x bGBt0Uzw0vSzXyqhVksdQzR914BpO/94E09Gjk8mcD7NiALCUyAWyYjkKpIFvSrkWIHT LaepyK6WN97k0kmge2w3aWQD6gnpjHw17sCB7OO+oZqbUrmGYfX1DPk40m8MLqkNxAw9 aqMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781750064; x=1782354864; 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=rFTRihsb4A12HPbEPFddMGd3EZlcBtB3kSw8HdT0K2I=; b=jyybJ2On3IzWfpoL4ebKxWGX1cEYnxc15gteugaLv2BmxtAUYz7QpidgszPS1gDJA/ YC5K47B6KoQvsaWqh2UMBiupdBoFXy3F9xbQVIcCy+DutUfnPhoRD8fy+qjiIXONKZMq lKgBvR28T/iI1Yz+gJGq+Vu8XCqS/hI7A/DUKbwWWsFR5jUXXRWJoXHn0WQVTptCWZ+V p554q+qd3VAfIi1wMC99HBtUIE2cDRxfxBVXaYy/yGe2HLkZz61pIVRafkTfmHyPZelD pyeSKOamD9cXO4EBG14au6pb2X/t8RKcPHfILY/jBIZVwp7nzzhFiCHxNBioI4MpGa19 cHpA== X-Forwarded-Encrypted: i=1; AFNElJ9qhytMCGfJw8EXzqP0H1eA/yjVSL2xr5panEHLx3icwz6mRvx/JlBvqX/PA77BPC3snT1h1knGkCJDoIw=@vger.kernel.org X-Gm-Message-State: AOJu0YzIwHQHuDvvIFoeoHg1XpVYU0TY/jNB+YB1u2IpuIw32OQ6x8ly Ln+WtxkuQE23i6FS25Na7K/H3s1DHPi9wM6bP2xQlqW+0x8aIv5zw8mO X-Gm-Gg: AfdE7ckwkBcuKQD4lQmr760ZiYkJCFemY4FNvGAGyzUz1J70HlEBJT0KKyk8PTqS8/1 diGPdso6XCP7wibfMp3QEZNVjHz6dFMxfom0k+r+39D31ibyq08di9T9M2jeJ0mR0VE8M9YAUtf IqPdr6m1Og7KGKzseAwLkXe9hGkpkFDPkueEGq/8rh9Gz/TJ+NkFMth95jbVg5wXJB+KbrwqXrj WcnBllAJlaYcLgPNC2WmBUE877/vV3V8hueXBKzuLj+XyEkzKSNjgJpYQItJalOl34p88FPXu0E eDRb7e0J5oI1KjFicP8Tnm0dSMsNvmqTtQZejSeHH5u1ODtK/rhBS10tWbw+2S4k3XMcjlgqlZQ 9D1vRxVdI5QLhNzgcR4pjwXYKtX/yg04f0hGAiI7m1yCYdXztNFsoCNSUPge63LDwAeaXg3G1PV CvdpaZ0GbunrWIpzcQPBXG8Rm+LUHfzZA75s/Tmu8Azrytm6YV8fKd4zQ34UrDKFQPPdlSE9uzu Pwfnksk5tNLKKwNSpPt5tIU X-Received: by 2002:a17:90b:1c10:b0:36d:7b62:4767 with SMTP id 98e67ed59e1d1-37ce44ed8c4mr1645800a91.5.1781750063795; Wed, 17 Jun 2026 19:34:23 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7305:54ba:2fb4:e198]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-37c930d7f81sm4976010a91.6.2026.06.17.19.34.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2026 19:34:23 -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: emac: Fix NULL pointer dereference in emac_probe Date: Wed, 17 Jun 2026 19:34:05 -0700 Message-ID: <20260618023405.415644-1-rosenp@gmail.com> X-Mailer: git-send-email 2.54.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 Move devm_request_irq() after devm_platform_ioremap_resource() so that dev->emacp is mapped before the interrupt handler can fire. An early interrupt hitting emac_irq() would dereference the NULL dev->emacp and crash. Also remove redundant error message. devm_platform_ioremap_resource() already returns an error message with dev_err_probe(). Fixes: dcc34ef7c834 ("net: ibm: emac: manage emac_irq with devm") Assisted-by: Opencode:Big-Pickle Signed-off-by: Rosen Penev --- v2: remove redundant error message. drivers/net/ethernet/ibm/emac/core.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c index 80f0c8985845..62ee1b70c3e7 100644 --- a/drivers/net/ethernet/ibm/emac/core.c +++ b/drivers/net/ethernet/ibm/emac/core.c @@ -3044,6 +3044,12 @@ static int emac_probe(struct platform_device *ofdev) if (err) goto err_gone; + dev->emacp = devm_platform_ioremap_resource(ofdev, 0); + if (IS_ERR(dev->emacp)) { + err = PTR_ERR(dev->emacp); + goto err_gone; + } + /* Setup error IRQ handler */ dev->emac_irq = platform_get_irq(ofdev, 0); if (dev->emac_irq < 0) { @@ -3061,13 +3067,6 @@ static int emac_probe(struct platform_device *ofdev) ndev->irq = dev->emac_irq; - dev->emacp = devm_platform_ioremap_resource(ofdev, 0); - if (IS_ERR(dev->emacp)) { - dev_err(&ofdev->dev, "can't map device registers"); - err = PTR_ERR(dev->emacp); - goto err_gone; - } - /* Wait for dependent devices */ err = emac_wait_deps(dev); if (err) -- 2.54.0