From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oi1-f194.google.com (mail-oi1-f194.google.com [209.85.167.194]) (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 6D78D21CFEF for ; Thu, 5 Feb 2026 06:52:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.194 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770274344; cv=none; b=WczJhrzjkJjVmFLFxRyClHHj19Pto0X7WOuBtR4/y9vmaIM6XGO42lkiWOyv2ITmPkyDcGeWLfcDc3L68r5T2otKrRApYxXYFQFFXGW5vgI+NfR/aE47XRZsqsqRxUSlDpqcpHrmoNn3LEONIDwZhTPiohYpoi3zb0ltyJz6XeU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770274344; c=relaxed/simple; bh=+vVoWX5sFN28i7ElAcVrMV2S8tLwXEb2jqKiNAZ9aNA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=fY47SUPlaiL81cA361GdCd8zQhZCS8VjrHjwt14VUDL2ZRSKeLMF8YPOb7z86S2wdJ13qLOdPd7TXEofLMVaJosdWyj+9RraKRsKfyIIXCLhKIchIS8DuYdyGXAmQmjNdPtS/I5VYaR1Q7LQYysPNMyCLVuV8C2ZkDayA49FaHI= 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=DPBSjyV+; arc=none smtp.client-ip=209.85.167.194 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="DPBSjyV+" Received: by mail-oi1-f194.google.com with SMTP id 5614622812f47-45effa36208so441364b6e.1 for ; Wed, 04 Feb 2026 22:52:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770274343; x=1770879143; 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=NCXhBetIeM8B093OOufJcFHuH7QubNuOW96Pk4CsbeQ=; b=DPBSjyV+OMQuUHXi0cr5GlZii98goVYIjFJL6lV3dSAfoOEJsNoKium+k898+lrm7h zdmoCl9SCgVdzrTormS/7iFlv1u5Xd8vAQB/tX1gHzVbREA3iBjdpNG+W0qjibPDnGzp vfOuXTHeBxaqc5IyohdA2C1K8yOpgiRFOq9Md7hQfO/l9kpHxAjtp4tO61c1/DvBCsi6 F69lnO23OyVUXHE2yn4rwkRO8MNEY1E0yT6e75/Ha/do/6gitaklnHQ7Z8Ue3onmKQJd 0u+Z6HBV+nlaOB+2yM/Y5eO8Y0R+ZXEXsurqykiIgdYRef4YsNFJ1tZPo4rLyWztTiOZ qOyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770274343; x=1770879143; 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=NCXhBetIeM8B093OOufJcFHuH7QubNuOW96Pk4CsbeQ=; b=VFWP2ktZvOUPuLgWUnflTA2Jq/LmkuXGd3TFXkhO+vsM011Aykm4tRa/p8zvs5FUQY g67qo9yx1c1OlO64VSDQNppBmwXCXd9PvXpm5s/tXYUBwkTTBg4R1XvLYHF2jDqfWqwq Al35xhYznMZ2Ejy9u59Lzy9XRsjC++1TwAHxU/ddNTFtp56GFs4LCNBu1KWifPsfohez 5ErJfwIiTj/JTNkvf7swgiKh/8TtiaFg1ObkdUq9bOt0sS66qDHQWxQYPi4DRILgSOaj yraR+fyHAoQEMlLYGbHGtH9UN2xtgh5oq24IeVjUvIBm+HKegCjLhzoBIjrsb0fg5kYO R68w== X-Gm-Message-State: AOJu0YwjsgqD6pHgFsZsi8GyAyWNo3bTHr9VI661qw9qP8PSBwNQl6QD Rr3g8PVbfVBVPysS94dMo0bGadYm2bmRjM4J57ttqWt85X3vWjZfllAGpyLVIdEq X-Gm-Gg: AZuq6aKquLN++0W/0ezXehy9mawXoTfRSFaFda2kENhgJIjAk/xXjrMetNr2p/sj8Sf jc6A1Sfv1YKUbMFeVh7mgKsNVtaNThSBGyJu8I4gZYmcilLfsn+rHht8onfObq/jJn6+GPXnjZU tagktFzOLkqSkCw6GueJp1ZoB/+/1TRzWXtu9MeMtIJcqCwqQueyo4F5VuxB6IoU44GZNtd2bEb oUHSTt6wAYbpwPf1XlrhljIwqE6f5Qovwh97IntrWXKHkcSoR3Taw+Izcy5gWpRnzGdm4liwJ8+ wTHgksdEEgUfeLSz2UUoeHZQWsgT3ZG9g8FVWwIcbKgShD0monr8aOxqJdd6TxRWItNEXTkSazW J76lu6B/3RgXia9soVkkWLjzO05L1FGCZiqUSyT48U/dDHysv75HWLfhgGxU0Ogh6Ahy4pm1vwe dR9ONSbiLRikFCJjIKirBAdydELanjphZdICM5gKcB6SiVoIDWFMgN19BnifKMipmLG+HwV562w 8NF/AvSIuggdb+89NOAFlvB2vy4LmPkjNaA7tXtbsmXjOraeCLRMX/umRkSrPzlDwz9onrpMtmJ RM3D X-Received: by 2002:a05:6808:4fce:b0:450:89ee:923d with SMTP id 5614622812f47-462d59f3861mr2634372b6e.31.1770274343294; Wed, 04 Feb 2026 22:52:23 -0800 (PST) Received: from ethan-latitude5420.. (host-127-24.cafrjco.fresno.ca.us.clients.pavlovmedia.net. [68.180.127.24]) by smtp.gmail.com with ESMTPSA id 5614622812f47-462d6801c3esm2743299b6e.21.2026.02.04.22.52.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Feb 2026 22:52:22 -0800 (PST) From: Ethan Nelson-Moore To: netdev@vger.kernel.org Cc: Ethan Nelson-Moore , stable@vger.kernel.org, Michael Grzeschik , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Zheyu Ma Subject: [PATCH net-next] net: arcnet: com20020-pci: fix support for 2.5Mbit cards Date: Wed, 4 Feb 2026 22:51:12 -0800 Message-ID: <20260205065113.33547-1-enelsonmoore@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Commit 8c14f9c70327 ("ARCNET: add com20020 PCI IDs with metadata") converted the com20020-pci driver to use a card info structure instead of a single flag mask in driver_data. However, it failed to take into account that in the original code, driver_data of 0 indicates a card with no special flags, not a card that should not have any card info structure. This introduced a null pointer dereference when cards with no flags were probed. Commit bd6f1fd5d33d ("net: arcnet: com20020: Fix null-ptr-deref in com20020pci_probe()") then papered over this issue by rejecting cards with no driver_data instead of resolving the problem at its source. Revert the incorrect fix and fix the original issue by introducing a new card info structure for 2.5Mbit cards that does not set any flags. Fixes: 8c14f9c70327 ("ARCNET: add com20020 PCI IDs with metadata") Fixes: bd6f1fd5d33d ("net: arcnet: com20020: Fix null-ptr-deref in com20020pci_probe()") Cc: stable@vger.kernel.org Signed-off-by: Ethan Nelson-Moore --- drivers/net/arcnet/com20020-pci.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c index 0472bcdff130..4847f40a2095 100644 --- a/drivers/net/arcnet/com20020-pci.c +++ b/drivers/net/arcnet/com20020-pci.c @@ -139,9 +139,6 @@ static int com20020pci_probe(struct pci_dev *pdev, return -ENOMEM; ci = (struct com20020_pci_card_info *)id->driver_data; - if (!ci) - return -EINVAL; - priv->ci = ci; mm = &ci->misc_map; @@ -347,6 +344,18 @@ static struct com20020_pci_card_info card_info_5mbit = { .flags = ARC_IS_5MBIT, }; +static struct com20020_pci_card_info card_info_2p5mbit = { + .name = "ARC-PCI", + .devcount = 1, + .chan_map_tbl = { + { + .bar = 2, + .offset = 0x00, + .size = 0x08, + }, + }, +}; + static struct com20020_pci_card_info card_info_sohard = { .name = "SOHARD SH ARC-PCI", .devcount = 1, @@ -448,49 +457,49 @@ static const struct pci_device_id com20020pci_id_table[] = { 0x1571, 0xa001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, - 0, + (kernel_ulong_t)&card_info_2p5mbit }, { 0x1571, 0xa002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, - 0, + (kernel_ulong_t)&card_info_2p5mbit }, { 0x1571, 0xa003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, - 0 + (kernel_ulong_t)&card_info_2p5mbit }, { 0x1571, 0xa004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, - 0, + (kernel_ulong_t)&card_info_2p5mbit }, { 0x1571, 0xa005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, - 0 + (kernel_ulong_t)&card_info_2p5mbit }, { 0x1571, 0xa006, PCI_ANY_ID, PCI_ANY_ID, 0, 0, - 0 + (kernel_ulong_t)&card_info_2p5mbit }, { 0x1571, 0xa007, PCI_ANY_ID, PCI_ANY_ID, 0, 0, - 0 + (kernel_ulong_t)&card_info_2p5mbit }, { 0x1571, 0xa008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, - 0 + (kernel_ulong_t)&card_info_2p5mbit }, { 0x1571, 0xa009, -- 2.43.0