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

Commit a5266440 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'rmnet-Fix-leaks-in-failure-scenarios' 



Subash Abhinov Kasiviswanathan says:

====================
net: qualcomm: rmnet: Fix leaks in failure scenarios

Patch 1 fixes a leak in transmit path where a skb cannot be
transmitted due to insufficient headroom to stamp the map header.
Patch 2 fixes a leak in rmnet_newlink() failure because the
rmnet endpoint was never freed
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c9d3fe9d 6296928f

drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c

+1 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ static int rmnet_newlink(struct net *src_net, struct net_device *dev, 
err1:

	rmnet_unregister_real_device(real_dev, port);

err0:

	kfree(ep);

	return err;

}

drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c

+6 −2
Original line number Diff line number Diff line
@@ -126,12 +126,12 @@ static int rmnet_map_egress_handler(struct sk_buff *skb, 


	if (skb_headroom(skb) < required_headroom) {

		if (pskb_expand_head(skb, required_headroom, 0, GFP_KERNEL))

			return RMNET_MAP_CONSUMED;

			goto fail;

	}



	map_header = rmnet_map_add_map_header(skb, additional_header_len, 0);

	if (!map_header)

		return RMNET_MAP_CONSUMED;

		goto fail;



	if (port->egress_data_format & RMNET_EGRESS_FORMAT_MUXING) {

		if (mux_id == 0xff)
@@ -143,6 +143,10 @@ static int rmnet_map_egress_handler(struct sk_buff *skb, 
	skb->protocol = htons(ETH_P_MAP);



	return RMNET_MAP_SUCCESS;



fail:

	kfree_skb(skb);

	return RMNET_MAP_CONSUMED;

}



static void