Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add KERNEL_LOCK in ppptioctl() to protect struct ppp_softc members. 

struct linesw.i_ioctl can be called without any preservation when the caller's
struct cdevsw is set D_MPSAFE such as ucom(4).
This commit is contained in:
knakahara 2019-01-24 09:31:09 +00:00
parent 0a9044b05b
commit 37f36945b2
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/net/ppp_tty.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ppp_tty.c,v 1.64 2018/02/07 06:19:43 mrg Exp $ */
/* $NetBSD: ppp_tty.c,v 1.65 2019/01/24 09:31:09 knakahara Exp $ */
/* Id: ppp_tty.c,v 1.3 1996/07/01 01:04:11 paulus Exp */
/*
@ -93,7 +93,7 @@
/* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ppp_tty.c,v 1.64 2018/02/07 06:19:43 mrg Exp $");
__KERNEL_RCSID(0, "$NetBSD: ppp_tty.c,v 1.65 2019/01/24 09:31:09 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "ppp.h"
@ -439,9 +439,16 @@ ppptioctl(struct tty *tp, u_long cmd, void *data, int flag, struct lwp *l)
struct ppp_softc *sc = (struct ppp_softc *) tp->t_sc;
int error, s;
if (sc == NULL || tp != (struct tty *) sc->sc_devp)
if (sc == NULL)
return (EPASSTHROUGH);
KERNEL_LOCK(1, NULL);
if (tp != (struct tty *) sc->sc_devp) {
error = EPASSTHROUGH;
goto out;
}
error = 0;
switch (cmd) {
case TIOCRCVFRAME:
@ -492,6 +499,8 @@ ppptioctl(struct tty *tp, u_long cmd, void *data, int flag, struct lwp *l)
pppgetm(sc);
}
out:
KERNEL_UNLOCK_ONE(NULL);
return error;
}