Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21bdd575 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

HSI: ssi_protocol: double free in ssip_pn_xmit() 




[ Upstream commit 3026050179a3a9a6f5c892c414b5e36ecf092081 ]

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: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarSebastian Reichel <sre@kernel.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bff38ff0

drivers/hsi/clients/ssi_protocol.c

+3 −2
Original line number Diff line number Diff line
@@ -976,7 +976,7 @@ static int ssip_pn_xmit(struct sk_buff *skb, struct net_device *dev) 
		goto drop;

	/* Pad to 32-bits - FIXME: Revisit*/

	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...
@@ -1028,8 +1028,9 @@ static int ssip_pn_xmit(struct sk_buff *skb, struct net_device *dev) 
drop2:

	hsi_free_msg(msg);

drop:

	dev->stats.tx_dropped++;

	dev_kfree_skb(skb);

inc_dropped:

	dev->stats.tx_dropped++;



	return 0;

}