diff options
author | Douglas Caetano dos Santos <douglascs@taghos.com.br> | 2017-05-12 14:19:15 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-05-15 14:22:12 -0400 |
commit | d19b183cdc1fa3d70d6abe2a4c369e748cd7ebb8 (patch) | |
tree | f452ca1b8115d8493ada5403dbd5bad359471fe0 /net | |
parent | 4762010f09ac0453f613df345c5281e7f2dec510 (diff) |
net/packet: fix missing net_device reference release
When using a TX ring buffer, if an error occurs processing a control
message (e.g. invalid message), the net_device reference is not
released.
Fixes c14ac9451c348 ("sock: enable timestamping using control messages")
Signed-off-by: Douglas Caetano dos Santos <douglascs@taghos.com.br>
Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/packet/af_packet.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index f4001763134d..e3eeed19cc7a 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c | |||
@@ -2658,13 +2658,6 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) | |||
2658 | dev = dev_get_by_index(sock_net(&po->sk), saddr->sll_ifindex); | 2658 | dev = dev_get_by_index(sock_net(&po->sk), saddr->sll_ifindex); |
2659 | } | 2659 | } |
2660 | 2660 | ||
2661 | sockc.tsflags = po->sk.sk_tsflags; | ||
2662 | if (msg->msg_controllen) { | ||
2663 | err = sock_cmsg_send(&po->sk, msg, &sockc); | ||
2664 | if (unlikely(err)) | ||
2665 | goto out; | ||
2666 | } | ||
2667 | |||
2668 | err = -ENXIO; | 2661 | err = -ENXIO; |
2669 | if (unlikely(dev == NULL)) | 2662 | if (unlikely(dev == NULL)) |
2670 | goto out; | 2663 | goto out; |
@@ -2672,6 +2665,13 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) | |||
2672 | if (unlikely(!(dev->flags & IFF_UP))) | 2665 | if (unlikely(!(dev->flags & IFF_UP))) |
2673 | goto out_put; | 2666 | goto out_put; |
2674 | 2667 | ||
2668 | sockc.tsflags = po->sk.sk_tsflags; | ||
2669 | if (msg->msg_controllen) { | ||
2670 | err = sock_cmsg_send(&po->sk, msg, &sockc); | ||
2671 | if (unlikely(err)) | ||
2672 | goto out_put; | ||
2673 | } | ||
2674 | |||
2675 | if (po->sk.sk_socket->type == SOCK_RAW) | 2675 | if (po->sk.sk_socket->type == SOCK_RAW) |
2676 | reserve = dev->hard_header_len; | 2676 | reserve = dev->hard_header_len; |
2677 | size_max = po->tx_ring.frame_size | 2677 | size_max = po->tx_ring.frame_size |