summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtem Chernyshev <artem.chernyshev@red-soft.ru>2022-12-01 17:00:30 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-12-14 11:32:01 +0100
commitbccda3ad0748958473eb730e29c0487007a98832 (patch)
tree6ac0ac51051c1854bcfdb57b85b5cbe128ecbd07
parente7b950458156d410509a08c41930b75e72985938 (diff)
downloadlinux-stable-bccda3ad0748958473eb730e29c0487007a98832.tar.gz
linux-stable-bccda3ad0748958473eb730e29c0487007a98832.tar.bz2
linux-stable-bccda3ad0748958473eb730e29c0487007a98832.zip
net: dsa: ksz: Check return value
[ Upstream commit 3d8fdcbf1f42e2bb9ae8b8c0b6f202278c788a22 ] Return NULL if we got unexpected value from skb_trim_rcsum() in ksz_common_rcv() Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: bafe9ba7d908 ("net: dsa: ksz: Factor out common tag code") Signed-off-by: Artem Chernyshev <artem.chernyshev@red-soft.ru> Reviewed-by: Vladimir Oltean <olteanv@gmail.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Link: https://lore.kernel.org/r/20221201140032.26746-1-artem.chernyshev@red-soft.ru Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--net/dsa/tag_ksz.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/dsa/tag_ksz.c b/net/dsa/tag_ksz.c
index 4820dbcedfa2..230ddf45dff0 100644
--- a/net/dsa/tag_ksz.c
+++ b/net/dsa/tag_ksz.c
@@ -22,7 +22,8 @@ static struct sk_buff *ksz_common_rcv(struct sk_buff *skb,
if (!skb->dev)
return NULL;
- pskb_trim_rcsum(skb, skb->len - len);
+ if (pskb_trim_rcsum(skb, skb->len - len))
+ return NULL;
skb->offload_fwd_mark = true;