Page MenuHomeFreeBSD
Differential D29328

Unbreak MSG_CMSG_CLOEXEC
ClosedPublic
Actions

Authored by arichardson on Mar 18 2021, 5:33 PM.
Tags
None
Referenced Files
Unknown Object (File)
Feb 24 2025, 6:26 PM
Unknown Object (File)
Feb 10 2025, 1:08 PM
Unknown Object (File)
Feb 9 2025, 10:00 AM
Unknown Object (File)
Feb 2 2025, 7:57 PM
Unknown Object (File)
Jan 28 2025, 10:17 AM
Unknown Object (File)
Jan 25 2025, 7:46 PM
Unknown Object (File)
Jan 25 2025, 7:29 PM
Unknown Object (File)
Jan 17 2025, 1:20 PM
View All 69 Files
Subscribers
imp

Details

Reviewers
mjg
kib
jilles
Commits
rG7962978754d3: Unbreak MSG_CMSG_CLOEXEC
rG6ceacebdf522: Unbreak MSG_CMSG_CLOEXEC
Summary

MSG_CMSG_CLOEXEC has not been working since 2015 (SVN r284380) because
_finstall expects O_CLOEXEC and not UF_EXCLOSE as the flags argument.
This was probably not noticed because we don't have a test for this flag
so this commit adds one. I found this problem because one of the
libwayland tests was failing.

Fixes: ea31808c3b07 ("fd: move out actual fp installation to _finstall")

Test Plan

Newly added test failed before, passes now.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
sys/
kern/
2 lines
tests/
sys/
kern/
45 lines

Diff 85998

View Options

sys/kern/uipc_usrreq.c

Show First 20 Lines • Show All 51 Lines • ▼ Show 20 Lines
#include <net/vnet.h> #include <net/vnet.h>
#include <netinet/in_systm.h> #include <netinet/in_systm.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/ip6.h> #include <netinet/ip6.h>
#include <netinet/ip.h> #include <netinet/ip.h>
#include <netinet/ip_var.h> #include <netinet/ip_var.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
#include <netinet/tcp_seq.h>
#include <netinet/tcp_lro.h> #include <netinet/tcp_lro.h>
#include <netinet/tcp_var.h> #include <netinet/tcp_var.h>
#include <netinet6/ip6_var.h> #include <netinet6/ip6_var.h>
#include <machine/in_cksum.h> #include <machine/in_cksum.h>
static MALLOC_DEFINE(M_LRO, "LRO", "LRO control structures"); static MALLOC_DEFINE(M_LRO, "LRO", "LRO control structures");
▲ Show 20 Lines • Show All 721 Lines • ▼ Show 20 Lines#endif
if (le->p_len > (lc->lro_length_lim - tcp_data_len)) { if (le->p_len > (lc->lro_length_lim - tcp_data_len)) {
tcp_lro_active_remove(le); tcp_lro_active_remove(le);
tcp_lro_flush(lc, le); tcp_lro_flush(lc, le);
break; break;
} }
/* Try to append the new segment. */ /* Try to append the new segment. */
if (__predict_false(seq != le->next_seq || if (__predict_false(seq != le->next_seq ||
(tcp_data_len == 0 && le->ack_seq == th->th_ack))) { (tcp_data_len == 0 &&
le->ack_seq == th->th_ack &&
le->window == th->th_win))) {
/* Out of order packet or duplicate ACK. */ /* Out of order packet or duplicate ACK. */
tcp_lro_active_remove(le); tcp_lro_active_remove(le);
tcp_lro_flush(lc, le); tcp_lro_flush(lc, le);
return (TCP_LRO_CANNOT); return (TCP_LRO_CANNOT);
} }
if (l != 0) { if (l != 0) {
uint32_t tsval = ntohl(*(ts_ptr + 1)); uint32_t tsval = ntohl(*(ts_ptr + 1));
/* Make sure timestamp values are increasing. */ /* Make sure timestamp values are increasing. */
/* XXX-BZ flip and use TSTMP_GEQ macro for this? */ /* XXX-BZ flip and use TSTMP_GEQ macro for this? */
if (__predict_false(le->tsval > tsval || if (__predict_false(le->tsval > tsval ||
*(ts_ptr + 2) == 0)) *(ts_ptr + 2) == 0))
return (TCP_LRO_CANNOT); return (TCP_LRO_CANNOT);
le->tsval = tsval; le->tsval = tsval;
le->tsecr = *(ts_ptr + 2); le->tsecr = *(ts_ptr + 2);
} }
if (tcp_data_len || SEQ_GT(ntohl(th->th_ack), ntohl(le->ack_seq))) {
le->next_seq += tcp_data_len; le->next_seq += tcp_data_len;
le->ack_seq = th->th_ack; le->ack_seq = th->th_ack;
le->window = th->th_win; le->window = th->th_win;
le->append_cnt++; le->append_cnt++;
} else if (th->th_ack == le->ack_seq) {
le->window = WIN_MAX(le->window, th->th_win);
le->append_cnt++;
} else {
/* no data and old ack */
le->append_cnt++;
m_freem(m);
return (0);
}
#ifdef TCP_LRO_UPDATE_CSUM #ifdef TCP_LRO_UPDATE_CSUM
le->ulp_csum += tcp_lro_rx_csum_fixup(le, l3hdr, th, le->ulp_csum += tcp_lro_rx_csum_fixup(le, l3hdr, th,
tcp_data_len, ~csum); tcp_data_len, ~csum);
#endif #endif
if (tcp_data_len == 0) { if (tcp_data_len == 0) {
m_freem(m); m_freem(m);
/* /*
▲ Show 20 Lines • Show All 151 Lines • Show Last 20 Lines
View Options

tests/sys/kern/unix_passfd_test.c

Show First 20 Lines • Show All 51 Lines • ▼ Show 20 Lines
#include <net/vnet.h> #include <net/vnet.h>
#include <netinet/in_systm.h> #include <netinet/in_systm.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/ip6.h> #include <netinet/ip6.h>
#include <netinet/ip.h> #include <netinet/ip.h>
#include <netinet/ip_var.h> #include <netinet/ip_var.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
#include <netinet/tcp_seq.h>
#include <netinet/tcp_lro.h> #include <netinet/tcp_lro.h>
#include <netinet/tcp_var.h> #include <netinet/tcp_var.h>
#include <netinet6/ip6_var.h> #include <netinet6/ip6_var.h>
#include <machine/in_cksum.h> #include <machine/in_cksum.h>
static MALLOC_DEFINE(M_LRO, "LRO", "LRO control structures"); static MALLOC_DEFINE(M_LRO, "LRO", "LRO control structures");
▲ Show 20 Lines • Show All 721 Lines • ▼ Show 20 Lines#endif
if (le->p_len > (lc->lro_length_lim - tcp_data_len)) { if (le->p_len > (lc->lro_length_lim - tcp_data_len)) {
tcp_lro_active_remove(le); tcp_lro_active_remove(le);
tcp_lro_flush(lc, le); tcp_lro_flush(lc, le);
break; break;
} }
/* Try to append the new segment. */ /* Try to append the new segment. */
if (__predict_false(seq != le->next_seq || if (__predict_false(seq != le->next_seq ||
(tcp_data_len == 0 && le->ack_seq == th->th_ack))) { (tcp_data_len == 0 &&
le->ack_seq == th->th_ack &&
le->window == th->th_win))) {
/* Out of order packet or duplicate ACK. */ /* Out of order packet or duplicate ACK. */
tcp_lro_active_remove(le); tcp_lro_active_remove(le);
tcp_lro_flush(lc, le); tcp_lro_flush(lc, le);
return (TCP_LRO_CANNOT); return (TCP_LRO_CANNOT);
} }
if (l != 0) { if (l != 0) {
uint32_t tsval = ntohl(*(ts_ptr + 1)); uint32_t tsval = ntohl(*(ts_ptr + 1));
/* Make sure timestamp values are increasing. */ /* Make sure timestamp values are increasing. */
/* XXX-BZ flip and use TSTMP_GEQ macro for this? */ /* XXX-BZ flip and use TSTMP_GEQ macro for this? */
if (__predict_false(le->tsval > tsval || if (__predict_false(le->tsval > tsval ||
*(ts_ptr + 2) == 0)) *(ts_ptr + 2) == 0))
return (TCP_LRO_CANNOT); return (TCP_LRO_CANNOT);
le->tsval = tsval; le->tsval = tsval;
le->tsecr = *(ts_ptr + 2); le->tsecr = *(ts_ptr + 2);
} }
if (tcp_data_len || SEQ_GT(ntohl(th->th_ack), ntohl(le->ack_seq))) {
le->next_seq += tcp_data_len; le->next_seq += tcp_data_len;
le->ack_seq = th->th_ack; le->ack_seq = th->th_ack;
le->window = th->th_win; le->window = th->th_win;
le->append_cnt++; le->append_cnt++;
} else if (th->th_ack == le->ack_seq) {
le->window = WIN_MAX(le->window, th->th_win);
le->append_cnt++;
} else {
/* no data and old ack */
le->append_cnt++;
m_freem(m);
return (0);
}
#ifdef TCP_LRO_UPDATE_CSUM #ifdef TCP_LRO_UPDATE_CSUM
le->ulp_csum += tcp_lro_rx_csum_fixup(le, l3hdr, th, le->ulp_csum += tcp_lro_rx_csum_fixup(le, l3hdr, th,
tcp_data_len, ~csum); tcp_data_len, ~csum);
#endif #endif
if (tcp_data_len == 0) { if (tcp_data_len == 0) {
m_freem(m); m_freem(m);
/* /*
▲ Show 20 Lines • Show All 151 Lines • Show Last 20 Lines