netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net] net/hsr: Check skb_put_padto() return value
@ 2017-08-21 19:59 Florian Fainelli
  2017-08-22 20:49 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Florian Fainelli @ 2017-08-21 19:59 UTC (permalink / raw)
  To: netdev
  Cc: mail, peter.heise, Florian Fainelli, Arvid Brodin,
	David S. Miller, open list

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>
---
 net/hsr/hsr_device.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c
index 4e7bdb213cd0..172d8309f89e 100644
--- a/net/hsr/hsr_device.c
+++ b/net/hsr/hsr_device.c
@@ -314,7 +314,8 @@ static void send_hsr_supervision_frame(struct hsr_port *master,
 	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;
-- 
2.9.3

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH net] net/hsr: Check skb_put_padto() return value
  2017-08-21 19:59 [PATCH net] net/hsr: Check skb_put_padto() return value Florian Fainelli
@ 2017-08-22 20:49 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2017-08-22 20:49 UTC (permalink / raw)
  To: f.fainelli; +Cc: netdev, mail, peter.heise, arvid.brodin, linux-kernel

From: Florian Fainelli <f.fainelli@gmail.com>
Date: Mon, 21 Aug 2017 12:59:10 -0700

> 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>

Applied, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-08-22 20:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-21 19:59 [PATCH net] net/hsr: Check skb_put_padto() return value Florian Fainelli
2017-08-22 20:49 ` David Miller

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).