summaryrefslogtreecommitdiff
path: root/net/hsr
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2017-08-21 12:59:10 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-10-01 20:40:01 +0200
commit9429a6b7e94eef4473ab2e5a6fbaddd8a65e24e9 (patch)
tree24ef88c8b429e0158c8fa2aaa4d1d80c7a0dec4e /net/hsr
parent5427e3999207256cc878a4cac8ba7a1cbbc840ea (diff)
downloadlinux-rt-9429a6b7e94eef4473ab2e5a6fbaddd8a65e24e9.tar.gz
net/hsr: Check skb_put_padto() return value
commit 414e7d76af6d3ec2dd4e9079927dbe0e2e4ca914 upstream. skb_put_padto() will free the sk_buff passed as reference in case of errors, but we still need to check its return value and decide what to do. Detected by CoverityScan, CID#1416688 ("CHECKED_RETURN") Fixes: ee1c27977284 ("net/hsr: Added support for HSR v1") Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/hsr')
-rw-r--r--net/hsr/hsr_device.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c
index aead5ac4dbf6..ea07c91ab348 100644
--- a/net/hsr/hsr_device.c
+++ b/net/hsr/hsr_device.c
@@ -315,7 +315,8 @@ static void send_hsr_supervision_frame(struct hsr_port *master,
hsr_sp = (typeof(hsr_sp)) skb_put(skb, sizeof(struct hsr_sup_payload));
ether_addr_copy(hsr_sp->MacAddressA, master->dev->dev_addr);
- skb_put_padto(skb, ETH_ZLEN + HSR_HLEN);
+ if (skb_put_padto(skb, ETH_ZLEN + HSR_HLEN))
+ return;
hsr_forward_skb(skb, master);
return;