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

Commit 5c6ba7d5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hsi-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi 

Pull HSI fix from Sebastian Reichel:
 "Fix double free fix in ssi-protocol"

* tag 'hsi-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
  HSI: ssi_protocol: double free in ssip_pn_xmit()
parents 7f2ebde7 30260501

drivers/hsi/clients/ssi_protocol.c

+3 −2
Original line number Diff line number Diff line
@@ -980,7 +980,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...
@@ -1032,8 +1032,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;

}