diff options
| author | delphij <delphij@FreeBSD.org> | 2017-08-10 06:59:07 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2017-08-10 06:59:07 +0000 |
| commit | 91baad1bb58bfa59793d9421521a9faf7df0edca (patch) | |
| tree | 42938bf2e6e785a0b129322177b5ff0a1ddeeba9 /sys/kern/sys_socket.c | |
| parent | 2f4b735c66deb54490042a818e8fd26fa46818f1 (diff) | |
| download | FreeBSD-src-releng/11.1.zip FreeBSD-src-releng/11.1.tar.gz | |
Fix OpenSSH Denial of Service vulnerability. [SA-17:06]releng/11.1
Fix VNET kernel panic with asynchronous I/O. [EN-17:07]
Fix pf(4) housekeeping thread causes kernel panic. [EN-17:08]
Approved by: so
Diffstat (limited to 'sys/kern/sys_socket.c')
| -rw-r--r-- | sys/kern/sys_socket.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index da5f8e8..edc64aa 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -675,6 +675,7 @@ soaio_process_sb(struct socket *so, struct sockbuf *sb) { struct kaiocb *job; + CURVNET_SET(so->so_vnet); SOCKBUF_LOCK(sb); while (!TAILQ_EMPTY(&sb->sb_aiojobq) && soaio_ready(so, sb)) { job = TAILQ_FIRST(&sb->sb_aiojobq); @@ -698,6 +699,7 @@ soaio_process_sb(struct socket *so, struct sockbuf *sb) ACCEPT_LOCK(); SOCK_LOCK(so); sorele(so); + CURVNET_RESTORE(); } void |
