diff options
| author | Subash Abhinov Kasiviswanathan <subashab@codeaurora.org> | 2017-12-05 13:41:17 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-05 18:03:53 -0500 |
| commit | c20a548792f15f8d8e38cd74356301c6db0d241f (patch) | |
| tree | 6cac4cb3e41c0a55f25e1e7c35af6c168c8b432a /drivers/net | |
| parent | c9d3fe9da094a9a7a3d3cd365b334b822e05f5e8 (diff) | |
| download | linux-stable-c20a548792f15f8d8e38cd74356301c6db0d241f.tar.gz linux-stable-c20a548792f15f8d8e38cd74356301c6db0d241f.tar.bz2 linux-stable-c20a548792f15f8d8e38cd74356301c6db0d241f.zip | |
net: qualcomm: rmnet: Fix leak on transmit failure
If a skb in transmit path does not have sufficient headroom to add
the map header, the skb is not sent out and is never freed.
Fixes: ceed73a2cf4a ("drivers: net: ethernet: qualcomm: rmnet: Initial implementation")
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c index 29842ccc91a9..08e4afc0ab39 100644 --- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c +++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c @@ -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 |