| Message ID | 20220507235434.11693-3-greg@gregdf.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [1/3] main: Accept FD 0 as epoll_fd | expand |
diff --git a/ell/dhcp6-transport.c b/ell/dhcp6-transport.c index 04bf4fb..8d15606 100644 --- a/ell/dhcp6-transport.c +++ b/ell/dhcp6-transport.c @@ -45,7 +45,6 @@ struct dhcp6_default_transport { struct dhcp6_transport super; struct l_io *io; - int udp_fd; uint16_t port; struct in6_addr local; }; @@ -214,11 +213,6 @@ static void _dhcp6_default_transport_close(struct dhcp6_transport *s) l_io_destroy(transport->io); transport->io = NULL; - - if (transport->udp_fd >= 0) { - L_TFR(close(transport->udp_fd)); - transport->udp_fd = -1; - } } void _dhcp6_transport_set_rx_callback(struct dhcp6_transport *transport,
_dhcp6_default_transport_new forgot to initialize the udp_fd field to a negative value. Because of this, _dhcp6_default_transport_close would try to close it. For instance, this could end up closing FD 0 (stdin) if memory allocation returned was zeroed. However, udp_fd is not actually used and is a left over from from the dhcp-transport.c file that was copied to implement DHCPv6 in commit b384838d1a79182f09b71a7a48d103ff790b8ae6 ("dhcp6: Add dhcp6 transport abstraction and default"), so it can just be removed. --- ell/dhcp6-transport.c | 6 ------ 1 file changed, 6 deletions(-)