From nobody Thu Oct 2 13:00:50 2025 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (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 09B202D9488 for ; Tue, 16 Sep 2025 18:33:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758047606; cv=none; b=H0zBOgBe0zTor6qlp2RLLdChtcn6jIw49kIpzk+a2zMefEXHqwlV7RuTrqlojIMvzylPkoQe/6zwKpSQ/rPBWIqgY68rxv5qjuOsnupmWlPe4ahzz7hdpXeviwACAGyjEHCnIEOSxjj1uLcuSQ+TuFMdxh+dE7ZMslez0m9RTIA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758047606; c=relaxed/simple; bh=BlV/zHkqjQf+ifev6wIKglqCA5gEeZLAyIwo6fmUPNk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E7rWorO6iADvKBBAA2X9HH6oXUS/8uuTWAriw16ZueE6MK5JXKY5FBb3wY9//jx2xJpGkzUx46mhIVfOEx8Tjfw7mwyF1YaRAEBIc/NN246wqhAB3TpJeDiHmaGv+9SbPGs6IMK2+XUmWMIFxMl3GsxdyPYN0TnhXv3dFIkx/gY= 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=MgC3DJTS; arc=none smtp.client-ip=209.85.210.177 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="MgC3DJTS" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-7761a8a1dbcso3646509b3a.1 for ; Tue, 16 Sep 2025 11:33:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758047604; x=1758652404; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=w6NAtqurZPuJVv9MlI+fsRcvLTmzttrSsdFVWoHOXaA=; b=MgC3DJTSAbbAaWK5aNgomWWhN8rU22YE+QUx8HerMxfXvRDKujKr1jxsCdHp4nxsBu ZweHCbMjAEr1hYKk/gd1AwF0AKa+6yl+5S/+b/1nxTKoH8XGm0TITx1owect2EQN7sNz 5qVifne7tp6JML1YuOQpywvGSWOBSMYAZqb2yDX1rJSHgzO6ulkbc6955LOBM2k06Ucp Cd0E3OBCdeKMAB6xlJp4EuH9IIhjKZdR+sVKjBiWFfeltr/XVStChqM/w3zmSEwFHzbw j8dSnFOO8MbnpC6fkwVHD7twPEILuzjXVmb6qzk2gIugOtBpi0SEUKoucrckR/NrBs4o 7wmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758047604; x=1758652404; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w6NAtqurZPuJVv9MlI+fsRcvLTmzttrSsdFVWoHOXaA=; b=WUW6Y2GF/LsrP7fjJO8kaF7RTlyFgyHW0tQUaZpYaKZYVbmNnnN3hKYEOjOKjSgq3x fEhLHn4larQBb65Wd12nsjOAp+BGMI00fhPNKTCSAel5xASKK1vMslbMwolnzKfyht9x KOBnf8eHb72iMtFEQBc7RLATZIZntCzdWt084iV2mkb94oXKByHu1tnFp2Msu49qSOjc aWPj8ZaeA9INeG4gt098Z1ZezVOtBFLakG3J9BMeDRBi8ITdbc9j165zlZA4SqK+kepG IBicRbtYhtYjf+FHLK9pJ2b6x5adp4xUK63SVqW8OWzfkBric6CEfwh58u8B8yN52mT7 KHyw== X-Forwarded-Encrypted: i=1; AJvYcCV3E0eLidZsxg8ZPJuvTZu3IAsMfqHRxHK+dvw3VS8D5wKCadC7of82KZTS+DMdfUSKbmfhSi8W4B5EdEs=@vger.kernel.org X-Gm-Message-State: AOJu0YwjPzYPQWNp/8jJEafm85Mjw1XsRWDD9e8OYGbUPb6gVzMRi/0z m+nU94kRQ63IcNtWl+A4WNbka7c7dFwIprUU2WLvb8KFU8ZUbaxuCiax X-Gm-Gg: ASbGncsKJLNnGN2GOCT5ntbF7IGJt+4pGziRb1WS+zSFiaHXSqrwufjhnF4fCfzFT5g Mg3Z9Edex8I2vhiZEoYyFRks55vWo/lFKoINvhYTpsLgsRhUtsu/6pTHjAf3rqd9LcTeke0v6pq 82cn0f4JO4zoMOJ+2ZMsb3rB38m9Orcawc7ewbEngiziHaUx4HcsPoz9gIW8HF6KJBXM6BvlrqM rSD3vNGypKaUm3kN8hl7e8HGddDtq1oY/u54HKJukuMz9LTHT40ZV4vf+Ev6MM/n0+pkq9zBW9H 9jZbpPRUByFFrNHdRKwlevvR3dnWdMGWa5Vajr6iKO7GOA64+jADVZq9cJlbHv6gV4TGdVGeuZ1 4te3PNl21e4k1ZlIqGM7KLwGYAzpyv/ei1Rl2efTOezYD6AWr16E7kvM6 X-Google-Smtp-Source: AGHT+IE+y04TgsnGdr50srE5VJlDF11c/nMrRpgKED3As1DNw1hUFMxhvslMP2AQcq5t/31wHspodA== X-Received: by 2002:a05:6a20:7f87:b0:262:7029:107e with SMTP id adf61e73a8af0-26270291299mr14807680637.4.1758047604237; Tue, 16 Sep 2025 11:33:24 -0700 (PDT) Received: from mythos-cloud ([121.159.229.173]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b54a387b543sm14915968a12.33.2025.09.16.11.33.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Sep 2025 11:33:23 -0700 (PDT) From: Yeounsu Moon To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Yeounsu Moon , Andrew Lunn Subject: [PATCH net v3 1/2] net: dlink: fix whitespace around function call Date: Wed, 17 Sep 2025 03:33:04 +0900 Message-ID: <20250916183305.2808-2-yyyynoom@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250916183305.2808-1-yyyynoom@gmail.com> References: <20250916183305.2808-1-yyyynoom@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove unnecessary whitespace between function names and the opening parenthesis to follow kernel coding style. No functional change intended. Tested-on: D-Link DGE-550T Rev-A3 Signed-off-by: Yeounsu Moon Reviewed-by: Andrew Lunn --- drivers/net/ethernet/dlink/dl2k.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/dlink/dl2k.c b/drivers/net/ethernet/dlink= /dl2k.c index 6bbf6e5584e5..faf8a9fc7ed1 100644 --- a/drivers/net/ethernet/dlink/dl2k.c +++ b/drivers/net/ethernet/dlink/dl2k.c @@ -970,17 +970,17 @@ receive_packet (struct net_device *dev) desc_to_dma(desc), np->rx_buf_sz, DMA_FROM_DEVICE); - skb_put (skb =3D np->rx_skbuff[entry], pkt_len); + skb_put(skb =3D np->rx_skbuff[entry], pkt_len); np->rx_skbuff[entry] =3D NULL; } else if ((skb =3D netdev_alloc_skb_ip_align(dev, pkt_len))) { dma_sync_single_for_cpu(&np->pdev->dev, desc_to_dma(desc), np->rx_buf_sz, DMA_FROM_DEVICE); - skb_copy_to_linear_data (skb, + skb_copy_to_linear_data(skb, np->rx_skbuff[entry]->data, pkt_len); - skb_put (skb, pkt_len); + skb_put(skb, pkt_len); dma_sync_single_for_device(&np->pdev->dev, desc_to_dma(desc), np->rx_buf_sz, --=20 2.51.0 From nobody Thu Oct 2 13:00:50 2025 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 A4CE92DF15D for ; Tue, 16 Sep 2025 18:33:27 +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=1758047609; cv=none; b=Gynazo1R66C1mh2NpPQX843NQBIKiCGrWvRyzXe5fBMJ0w6qGDIrZbW6Cu27ybTTbWpv8DV+ThDL89D4CXwwvcuMUAj9p4VVLZnU0yLn3y68xJGV5MmH8zsqQuyj9XMulSU04CYK1TvHw7tl+diqW7d1tW1BSv3kQCgst+iTsUI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758047609; c=relaxed/simple; bh=ngLz/4Ezk/tubDYx/Lgk6Dje8hW93S4AUSflPV17tVs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DSqK5shClT/nqiars4NaKs+7NRZozx2ZqbyhL+JY1t8vUcvrJZEQi82yv3bshVfQ+HmZd1COp/McA5d++1R6CltG4jCdJxgsds/LAIKfPL5uVdhZtb8lBKIfwdR3PUClGAedE1iba8PknSAzTjRX62zueFpPHBaxthBik7dCk9E= 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=kcji2MQq; 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="kcji2MQq" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-32e6f3ed54dso2050612a91.3 for ; Tue, 16 Sep 2025 11:33:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758047607; x=1758652407; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=e6Ht+bpIkPjtMXWp9XgtcAPi+mKoELdBIJyuizZRIWY=; b=kcji2MQquAD2JVt3OJKRrf1p8vg5M4YNXVvx/2sM60eL32dFKXxY9sAi32XwlFC6Gf xUyyBj1T3CueFhlzMzSNXRYYDTbvAaZLyNiru5ePn9r9k8olxyGvoqWvESAQCXLXVE5J RiV4OPRX9MlwEgUFB4NwJFtUxXN8mBFEpSJuqV//oFXYe2teuzvo0DBjrOpsRuWMS33m UZWgGPujhPQy410EPBa5z8tX+7TpD8iW3/y1fWxWlxoYqjmGnMIrflmwrmD+EHx4rwAs EaCcVZcru25bg9LQ5dDL7NzDF2TcyYEdWulvl5uyKvLZPulaCG+6jL16TCNZSBc19tSg BgUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758047607; x=1758652407; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e6Ht+bpIkPjtMXWp9XgtcAPi+mKoELdBIJyuizZRIWY=; b=Xm8OovtbS8bsKbdjc39B0FkVZusVE1GXf2AW9oIsuXHdOqC8JPiuDcdGOhiaIVCc9S V/MmuicgMzLZa4wwiAvnz8b+pe+48qSNrYDhFrWULxsZB+jkCGjx5tC6YbPmzu4C1MsE duz1kQ90x13WcMKvjIVRas7xxGn33+Yn1rG1Ea7lSaRefEi6LpEqPHzztgwdNOtIPeoP dRcKkEtNu4pOOBJWWDYu+1lzMQ7e1Y9QGBkej1F4/mtERO9KtD5ZqN+MHEX32VU6ePky EZV/yjPPblzbX/5BEt4/QJZ0WSzv2yiEvSa0iM5vAk4xWld7rnO1B9kgnM3owywMvpIM /LPw== X-Forwarded-Encrypted: i=1; AJvYcCWb9dfwmvYS9zQQQF2F4It4DPNA1n3Xei4NAhnGynMSUAaer9N4/J7wLVNcsmC47aHMbpkiGGJxs6KeZ10=@vger.kernel.org X-Gm-Message-State: AOJu0Yzkvl5EFDv17+PxQkw3e0fYPGgg0DOxT/hlpBJPLg9Wo3sUagQb oXLG3pgXav7pPiELld0tyKh+2as01USsCJxZPgBeB3TEavZbKtBtqzmr X-Gm-Gg: ASbGncuZqBU8keXZT1JAKlKyOCximTXiwSNnqXUfWLAWPq8ZtpFaTGUNgdmN5b3df1W d+1TypJJcLR2dqRimtVpmfOIRYvL9Lwxkwt95cJtJe2yBBOBMcJ/VRXUGHKIbeLrfpo9Ym30i+M y9SRJeEDb/4AuiqTUSlTdrDFGKDVA9rHDMhq0bNb1zjfSAsoGXbALx4MZOPEj5OYxJhpwmIJhwS 1T/j6I0cjzMgr220K6EDKQ4lH4p8i8qvZwsT16zJZh2SBwmfHg2IrUSt7UVKWtTRv6kVGMU5KzF WKmre/KqqDlwUhbJJ11GIturMImGGSpXmO5T1dxpdhf0wATY9wVdCNKyI7IRkruU4UJdZpij/zr PxlX8LPywx53wqPjaq5wGcPMWxG1VW4S5uE2FR7CRDK5TWRuiHpBCEZPY X-Google-Smtp-Source: AGHT+IE60FRNbaIgGLpS7RTlhNopZLjGLrwDqgS+R4ggALxBYN8fkG1Oyxxw7C+bn8mbnje6yiDdYg== X-Received: by 2002:a17:90b:1fc6:b0:32e:1ff5:5af4 with SMTP id 98e67ed59e1d1-32e20049fbcmr14219148a91.35.1758047606752; Tue, 16 Sep 2025 11:33:26 -0700 (PDT) Received: from mythos-cloud ([121.159.229.173]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b54a387b543sm14915968a12.33.2025.09.16.11.33.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Sep 2025 11:33:26 -0700 (PDT) From: Yeounsu Moon To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Yeounsu Moon Subject: [PATCH net v3 2/2] net: dlink: handle copy_thresh allocation failure Date: Wed, 17 Sep 2025 03:33:05 +0900 Message-ID: <20250916183305.2808-3-yyyynoom@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250916183305.2808-1-yyyynoom@gmail.com> References: <20250916183305.2808-1-yyyynoom@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The driver did not handle failure of `netdev_alloc_skb_ip_align()`. If the allocation failed, dereferencing `skb->protocol` could lead to a NULL pointer dereference. This patch adds proper error handling by falling back to the `else` clause when the allocation fails. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Tested-on: D-Link DGE-550T Rev-A3 Signed-off-by: Yeounsu Moon Reviewed-by: Andrew Lunn --- drivers/net/ethernet/dlink/dl2k.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/dlink/dl2k.c b/drivers/net/ethernet/dlink= /dl2k.c index faf8a9fc7ed1..cff90417c05c 100644 --- a/drivers/net/ethernet/dlink/dl2k.c +++ b/drivers/net/ethernet/dlink/dl2k.c @@ -965,14 +965,11 @@ receive_packet (struct net_device *dev) struct sk_buff *skb; =20 /* Small skbuffs for short packets */ - if (pkt_len > copy_thresh) { - dma_unmap_single(&np->pdev->dev, - desc_to_dma(desc), - np->rx_buf_sz, - DMA_FROM_DEVICE); - skb_put(skb =3D np->rx_skbuff[entry], pkt_len); - np->rx_skbuff[entry] =3D NULL; - } else if ((skb =3D netdev_alloc_skb_ip_align(dev, pkt_len))) { + if (pkt_len <=3D copy_thresh) { + skb =3D netdev_alloc_skb_ip_align(dev, pkt_len); + if (!skb) + goto fallback_to_normal_path; + dma_sync_single_for_cpu(&np->pdev->dev, desc_to_dma(desc), np->rx_buf_sz, @@ -985,6 +982,14 @@ receive_packet (struct net_device *dev) desc_to_dma(desc), np->rx_buf_sz, DMA_FROM_DEVICE); + } else { +fallback_to_normal_path: + dma_unmap_single(&np->pdev->dev, + desc_to_dma(desc), + np->rx_buf_sz, + DMA_FROM_DEVICE); + skb_put(skb =3D np->rx_skbuff[entry], pkt_len); + np->rx_skbuff[entry] =3D NULL; } skb->protocol =3D eth_type_trans (skb, dev); #if 0 --=20 2.51.0