mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-03 06:45:37 -08:00
Code

Some times ago we disabled in-kernel timeout for pppx(4) related

Browse Source 
pipex(4) sessions. We did this for prevent use after free issue caused
by pipex_timer(). By default "idle-timeout" is not set in
npppd.conf(5) and I guess this is reason for we forgot to describe this
exception in npppd.conf(5).

Since it's pppx(4) related bug description was added to BUGS section of
pppx(4) man page.

npppd.conf(5) has this exception described in "idle-timeout" section.

ok jmc@ yasuoka@
This commit is contained in:
mvs 2020-08-09 14:35:31 +00:00
parent d8baefb339
commit c1a524bc1f
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
share/man/man4/pipex.4
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: pipex.4,v 1.12 2020/04/03 07:46:04 mpi Exp $
.\" $OpenBSD: pipex.4,v 1.13 2020/08/09 14:35:31 mvs Exp $
.\"
.\" Copyright (c) 2012 YASUOKA Masahiko <yasuoka@openbsd.org>
.\" Copyright (c) 2010 SUENAGA Hiroki <hsuenaga@openbsd.org>
@ -15,7 +15,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.Dd $Mdocdate: April 3 2020 $
.Dd $Mdocdate: August 9 2020 $
.Dt PIPEX 4
.Os
.Sh NAME
@ -288,3 +288,8 @@ The
.Nm
was written by
.An Internet Initiative Japan Inc .
.Sh BUGS
.Xr pppx 4
does not allow sessions with
.Ic pr_timeout_sec
set to any value other than 0.

7
usr.sbin/npppd/npppd/npppd.conf.5
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: npppd.conf.5,v 1.27 2020/04/23 21:10:54 jmc Exp $
.\" $OpenBSD: npppd.conf.5,v 1.28 2020/08/09 14:35:32 mvs Exp $
.\"
.\" Copyright (c) 2012 YASUOKA Masahiko <yasuoka@openbsd.org>
.\"
@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.Dd $Mdocdate: April 23 2020 $
.Dd $Mdocdate: August 9 2020 $
.Dt NPPPD.CONF 5
.Os
.Sh NAME
@ -325,6 +325,9 @@ The link is disconnected if there are no data packets sent or received
for more than the amount of the
.Ar idle-timeout .
The default is 0, which disables the idle timer.
This value must be 0 for
.Xr pppx 4
sessions.
.It Ic tcp-mss-adjust Ar yes | no
If
.Dq yes