From nobody Fri Dec 10 10:41:27 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 96C5318D7661; Fri, 10 Dec 2021 10:41:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J9SBH2RcJz3F37; Fri, 10 Dec 2021 10:41:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 33B0618EBD; Fri, 10 Dec 2021 10:41:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BAAfRfj016281; Fri, 10 Dec 2021 10:41:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BAAfRKV016280; Fri, 10 Dec 2021 10:41:27 GMT (envelope-from git) Date: Fri, 10 Dec 2021 10:41:27 GMT Message-Id: <202112101041.1BAAfRKV016280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 89bbc8498885 - stable/13 - sctp: inherit IP level socket options from listening socket List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 89bbc849888546bf8cd74c8356de70bc38cced8b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639132887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pueRyRJCAlPehXx1tTZQ671mda5k7ccK2WCBlRNItRA=; b=ChKOJRTSe/Mb84drmzl9ePud5nJWnnyA/5AaUP+BFXkHzcDSWhgsq7vELe8SWmE8KYqtf0 y5lqegR04skrq1FiyExtMM0jI/bj4js6m4Onsw3rkVAr80OnLzC0P+qrKhdqurR+4/Gdz0 d6PxeKcH/BFqWl0DYyt8tA7vFo8a+3W6UqWFQ8HcHNVQxUvi1c1O4B7bce90kMQorvdLDj uzAGE3/6gpXMHzKXLIssLyxZg5wYLVFEp4NVCq36dPmjDBDqSKjJSy90mnu0QUBa937bWU O0sFnPR5tBpCdrdMcuorrJ8jHgrb04VqprbyHcA3UBTdyfGdpQlHv0kDrrcSRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639132887; a=rsa-sha256; cv=none; b=X0jN89TwPCd907xkcZONvu6RQO6d5EDChCD+6eTXrd93Ca2tBktpFtGDmOC25oHjpyX8P3 n3oWpmsh2AcymXpwF8zsFn3+ALAfTVpbSZ87SlAwQZyKmfPMA1wZSBGC7fXJ948+R4cbMN Yy2VwtrhdMc+l7qZ3d/o1MwIZkMTeoAVEBEDvLwOrtlArZqoirha7p19zCk2d9/GuC5wRM ZLhqqfPOmtUhPnRopBIcVVrewLj84oDaPTyhTG29d0vOLG8VcTiVDfBFYfSAvcQ5aOTKAa KmRdwvL4Lghde3GYu0fM8VAKL0vVM93fJyH+5Du0hxjJmcrvAq8GOpIHqpkV/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=89bbc849888546bf8cd74c8356de70bc38cced8b commit 89bbc849888546bf8cd74c8356de70bc38cced8b Author: Michael Tuexen AuthorDate: 2021-12-03 21:40:52 +0000 Commit: Michael Tuexen CommitDate: 2021-12-10 10:40:59 +0000 sctp: inherit IP level socket options from listening socket Ensure that TTL and TOS values set on a listener get inheritet to the accepted sockets. PR: 260119 MFC after: 1 week (cherry picked from commit d79676fb1368f5acac5fd182363ea3f46fb3bd93) --- sys/netinet/sctp_pcb.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 7e0c0562e8a9..86f315afe051 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -2627,6 +2627,15 @@ sctp_move_pcb_and_assoc(struct sctp_inpcb *old_inp, struct sctp_inpcb *new_inp, SCTP_TCB_LOCK(stcb); atomic_subtract_int(&stcb->asoc.refcnt, 1); + if (old_inp->sctp_flags & SCTP_PCB_FLAGS_BOUND_V6) { + new_inp->ip_inp.inp.inp_flags |= old_inp->ip_inp.inp.inp_flags & INP_CONTROLOPTS; + if (old_inp->ip_inp.inp.in6p_outputopts) { + new_inp->ip_inp.inp.in6p_outputopts = ip6_copypktopts(old_inp->ip_inp.inp.in6p_outputopts, M_NOWAIT); + } + } else { + new_inp->ip_inp.inp.inp_ip_tos = old_inp->ip_inp.inp.inp_ip_tos; + new_inp->ip_inp.inp.inp_ip_ttl = old_inp->ip_inp.inp.inp_ip_ttl; + } new_inp->sctp_ep.time_of_secret_change = old_inp->sctp_ep.time_of_secret_change; memcpy(new_inp->sctp_ep.secret_key, old_inp->sctp_ep.secret_key,