openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

HSI: ssi_protocol: double free in ssip_pn_xmit() 

If skb_pad() fails then it frees skb and we don't need to free it again
at the end of the function.

Fixes: dc7bf5d7 ("HSI: Introduce driver for SSI Protocol")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
This commit is contained in:
Dan Carpenter 2017-04-21 13:39:09 +03:00 committed by Sebastian Reichel
parent c1ae3cfa0e
commit 3026050179
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/hsi/clients/ssi_protocol.c
View File

@ -980,7 +980,7 @@ static int ssip_pn_xmit(struct sk_buff *skb, struct net_device *dev)
goto drop; goto drop;
/* Pad to 32-bits - FIXME: Revisit*/ /* Pad to 32-bits - FIXME: Revisit*/
if ((skb->len & 3) && skb_pad(skb, 4 - (skb->len & 3))) if ((skb->len & 3) && skb_pad(skb, 4 - (skb->len & 3)))
goto drop; goto inc_dropped;
/* /*
* Modem sends Phonet messages over SSI with its own endianess... * Modem sends Phonet messages over SSI with its own endianess...
@ -1032,8 +1032,9 @@ static int ssip_pn_xmit(struct sk_buff *skb, struct net_device *dev)
drop2: drop2:
hsi_free_msg(msg); hsi_free_msg(msg);
drop: drop:
dev->stats.tx_dropped++;
dev_kfree_skb(skb); dev_kfree_skb(skb);
inc_dropped:
dev->stats.tx_dropped++;
return 0; return 0;
} }