diff options
| author | Richard Alpe <richard.alpe@ericsson.com> | 2016-02-11 10:43:15 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-16 15:58:40 -0500 |
| commit | 4952cd3e7b47dfe8f7d6c69973b13eb487eb2bd0 (patch) | |
| tree | 17bef7045a199c4c0a6e6fd7e1da9d90a6e47ff5 /net/tipc/link.c | |
| parent | 37ace20a3c99c54ebffb4b13671a01adb20926ca (diff) | |
| download | blackbird-op-linux-4952cd3e7b47dfe8f7d6c69973b13eb487eb2bd0.tar.gz blackbird-op-linux-4952cd3e7b47dfe8f7d6c69973b13eb487eb2bd0.zip | |
tipc: refactor node xmit and fix memory leaks
Refactor tipc_node_xmit() to fail fast and fail early. Fix several
potential memory leaks in unexpected error paths.
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Richard Alpe <richard.alpe@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/link.c')
| -rw-r--r-- | net/tipc/link.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index 6f4a6d9b0149..3e513daecf80 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c @@ -903,8 +903,10 @@ int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list, if (unlikely(l->backlog[i].len >= l->backlog[i].limit)) return link_schedule_user(l, list); } - if (unlikely(msg_size(hdr) > mtu)) + if (unlikely(msg_size(hdr) > mtu)) { + skb_queue_purge(list); return -EMSGSIZE; + } /* Prepare each packet for sending, and add to relevant queue: */ while (skb_queue_len(list)) { @@ -916,8 +918,10 @@ int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list, if (likely(skb_queue_len(transmq) < maxwin)) { _skb = skb_clone(skb, GFP_ATOMIC); - if (!_skb) + if (!_skb) { + skb_queue_purge(list); return -ENOBUFS; + } __skb_dequeue(list); __skb_queue_tail(transmq, skb); __skb_queue_tail(xmitq, _skb); |
