* [PATCH net] Fix net/hsr/hsr_device to check for freed skb buffer.
@ 2017-04-20 7:28 Peter Heise
2017-04-20 10:15 ` Sergei Shtylyov
0 siblings, 1 reply; 2+ messages in thread
From: Peter Heise @ 2017-04-20 7:28 UTC (permalink / raw)
To: Arvid Brodin, David S. Miller; +Cc: netdev
Fixed an unchecked call of skb_put_padto. Return value was ignored
before, however, skb_put_padto frees skb buffer in case of error.
As reported by Dan Carpenter on kernel-janitors.
Signed-off-by: Peter Heise <mail@pheise.de>
---
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 c73160fb11e7..22d693f213be 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 = (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;
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net] Fix net/hsr/hsr_device to check for freed skb buffer.
2017-04-20 7:28 [PATCH net] Fix net/hsr/hsr_device to check for freed skb buffer Peter Heise
@ 2017-04-20 10:15 ` Sergei Shtylyov
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Shtylyov @ 2017-04-20 10:15 UTC (permalink / raw)
To: Peter Heise, Arvid Brodin, David S. Miller; +Cc: netdev
Hello!
On 4/20/2017 10:28 AM, Peter Heise wrote:
> Fixed an unchecked call of skb_put_padto. Return value was ignored
> before, however, skb_put_padto frees skb buffer in case of error.
>
> As reported by Dan Carpenter on kernel-janitors.
>
> Signed-off-by: Peter Heise <mail@pheise.de>
> ---
> 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 c73160fb11e7..22d693f213be 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 = (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))
Need a space after *if*. Pleae run your patches thru scripts/checkpatch.pl
before sending.
> + return;
>
> hsr_forward_skb(skb, master);
> return;
MBR, Seregi
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-04-20 10:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-20 7:28 [PATCH net] Fix net/hsr/hsr_device to check for freed skb buffer Peter Heise
2017-04-20 10:15 ` Sergei Shtylyov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox