Skip to content

Commit d19b183

Browse files
Douglas Caetano dos Santosdavem330
authored andcommitted
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 c14ac94 ("sock: enable timestamping using control messages") Signed-off-by: Douglas Caetano dos Santos <[email protected]> Acked-by: Soheil Hassas Yeganeh <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 4762010 commit d19b183

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

net/packet/af_packet.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2658,20 +2658,20 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)
26582658
dev = dev_get_by_index(sock_net(&po->sk), saddr->sll_ifindex);
26592659
}
26602660

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-
26682661
err = -ENXIO;
26692662
if (unlikely(dev == NULL))
26702663
goto out;
26712664
err = -ENETDOWN;
26722665
if (unlikely(!(dev->flags & IFF_UP)))
26732666
goto out_put;
26742667

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+
26752675
if (po->sk.sk_socket->type == SOCK_RAW)
26762676
reserve = dev->hard_header_len;
26772677
size_max = po->tx_ring.frame_size

0 commit comments

Comments
 (0)