From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Yuanjun Gong <ruc_gongyuanjun@163.com>,
Simon Horman <simon.horman@corigine.com>,
"David S . Miller" <davem@davemloft.net>,
Sasha Levin <sashal@kernel.org>,
chris.snook@gmail.com, edumazet@google.com, kuba@kernel.org,
pabeni@redhat.com, pavan.chebbi@broadcom.com, trix@redhat.com,
netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 5.15 10/31] ethernet: atheros: fix return value check in atl1c_tso_csum()
Date: Sun, 13 Aug 2023 12:05:43 -0400 [thread overview]
Message-ID: <20230813160605.1080385-10-sashal@kernel.org> (raw)
In-Reply-To: <20230813160605.1080385-1-sashal@kernel.org>
From: Yuanjun Gong <ruc_gongyuanjun@163.com>
[ Upstream commit 8d01da0a1db237c44c92859ce3612df7af8d3a53 ]
in atl1c_tso_csum, it should check the return value of pskb_trim(),
and return an error code if an unexpected value is returned
by pskb_trim().
Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index 5cbd815c737e7..dad21b4fbc0bc 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -2104,8 +2104,11 @@ static int atl1c_tso_csum(struct atl1c_adapter *adapter,
real_len = (((unsigned char *)ip_hdr(skb) - skb->data)
+ ntohs(ip_hdr(skb)->tot_len));
- if (real_len < skb->len)
- pskb_trim(skb, real_len);
+ if (real_len < skb->len) {
+ err = pskb_trim(skb, real_len);
+ if (err)
+ return err;
+ }
hdr_len = (skb_transport_offset(skb) + tcp_hdrlen(skb));
if (unlikely(skb->len == hdr_len)) {
--
2.40.1
next prev parent reply other threads:[~2023-08-13 16:07 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-13 16:05 [PATCH AUTOSEL 5.15 01/31] phy: qcom-snps-femto-v2: keep cfg_ahb_clk enabled during runtime suspend Sasha Levin
2023-08-13 16:05 ` [PATCH AUTOSEL 5.15 02/31] phy: qcom-snps-femto-v2: use qcom_snps_hsphy_suspend/resume error code Sasha Levin
2023-08-13 16:05 ` [PATCH AUTOSEL 5.15 03/31] media: pulse8-cec: handle possible ping error Sasha Levin
2023-08-13 16:05 ` [PATCH AUTOSEL 5.15 04/31] media: pci: cx23885: fix error handling for cx23885 ATSC boards Sasha Levin
2023-08-13 16:05 ` [PATCH AUTOSEL 5.15 05/31] 9p: virtio: make sure 'offs' is initialized in zc_request Sasha Levin
2023-08-13 16:05 ` [PATCH AUTOSEL 5.15 06/31] ksmbd: fix out of bounds in smb3_decrypt_req() Sasha Levin
2023-08-13 16:05 ` [PATCH AUTOSEL 5.15 07/31] ksmbd: no response from compound read Sasha Levin
2023-08-13 16:05 ` [PATCH AUTOSEL 5.15 08/31] ASoC: da7219: Flush pending AAD IRQ when suspending Sasha Levin
2023-08-13 16:05 ` [PATCH AUTOSEL 5.15 09/31] ASoC: da7219: Check for failure reading AAD IRQ events Sasha Levin
2023-08-13 16:05 ` Sasha Levin [this message]
2023-08-13 16:05 ` [PATCH AUTOSEL 5.15 11/31] vxlan: generalize vxlan_parse_gpe_hdr and remove unused args Sasha Levin
2023-08-13 16:05 ` [PATCH AUTOSEL 5.15 12/31] m68k: Fix invalid .section syntax Sasha Levin
2023-08-13 16:05 ` [PATCH AUTOSEL 5.15 13/31] s390/dasd: use correct number of retries for ERP requests Sasha Levin
2023-08-13 16:05 ` [PATCH AUTOSEL 5.15 14/31] s390/dasd: fix hanging device after request requeue Sasha Levin
2023-08-13 16:05 ` [PATCH AUTOSEL 5.15 15/31] fs/nls: make load_nls() take a const parameter Sasha Levin
2023-08-13 16:05 ` [PATCH AUTOSEL 5.15 16/31] ASoC: rt5682-sdw: fix for JD event handling in ClockStop Mode0 Sasha Levin
2023-08-13 16:05 ` [PATCH AUTOSEL 5.15 17/31] ASoc: codecs: ES8316: Fix DMIC config Sasha Levin
2023-08-13 16:05 ` [PATCH AUTOSEL 5.15 18/31] ASoC: rt711: fix for JD event handling in ClockStop Mode0 Sasha Levin
2023-08-13 16:05 ` [PATCH AUTOSEL 5.15 19/31] ASoC: rt711-sdca: " Sasha Levin
2023-08-13 16:05 ` [PATCH AUTOSEL 5.15 20/31] ASoC: atmel: Fix the 8K sample parameter in I2SC master Sasha Levin
2023-08-13 16:05 ` [PATCH AUTOSEL 5.15 21/31] ALSA: usb-audio: Add quirk for Microsoft Modern Wireless Headset Sasha Levin
2023-08-13 16:05 ` [PATCH AUTOSEL 5.15 22/31] platform/x86: intel: hid: Always call BTNL ACPI method Sasha Levin
2023-08-13 16:05 ` [PATCH AUTOSEL 5.15 23/31] platform/x86/intel/hid: Add HP Dragonfly G2 to VGBS DMI quirks Sasha Levin
2023-08-13 16:05 ` [PATCH AUTOSEL 5.15 24/31] platform/x86: huawei-wmi: Silence ambient light sensor Sasha Levin
2023-08-13 16:05 ` [PATCH AUTOSEL 5.15 25/31] drm/amd/display: Exit idle optimizations before attempt to access PHY Sasha Levin
2023-08-13 16:05 ` [PATCH AUTOSEL 5.15 26/31] ovl: Always reevaluate the file signature for IMA Sasha Levin
2023-08-13 16:06 ` [PATCH AUTOSEL 5.15 27/31] ata: pata_arasan_cf: Use dev_err_probe() instead dev_err() in data_xfer() Sasha Levin
2023-08-13 16:06 ` [PATCH AUTOSEL 5.15 28/31] rbd: make get_lock_owner_info() return a single locker or NULL Sasha Levin
2023-08-14 13:17 ` Ilya Dryomov
2023-08-13 16:06 ` [PATCH AUTOSEL 5.15 29/31] rbd: harden get_lock_owner_info() a bit Sasha Levin
2023-08-13 16:06 ` [PATCH AUTOSEL 5.15 30/31] security: keys: perform capable check only on privileged operations Sasha Levin
2023-08-13 16:06 ` [PATCH AUTOSEL 5.15 31/31] kprobes: Prohibit probing on CFI preamble symbol Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230813160605.1080385-10-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=chris.snook@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=pavan.chebbi@broadcom.com \
--cc=ruc_gongyuanjun@163.com \
--cc=simon.horman@corigine.com \
--cc=stable@vger.kernel.org \
--cc=trix@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).