Module Name: src
Committed By: martin
Date: Sat Jul 20 14:37:05 UTC 2024
Modified Files:
src/sys/kern [netbsd-10]: uipc_socket.c
Log Message:
Pull up following revision(s) (requested by jdolecek in ticket #741):
sys/kern/uipc_socket.c: revision 1.309
make kqfilter() behave the same for PIPE_SOCKETPAIR pipe as it does
for standard one - refuse EVFILT_WRITE if the reader is already disconnected
fixes test failure for kernel/kqueue/write/t_pipe.c on PIPE_SOCKETPAIR kernel
PR kern/55690
To generate a diff of this commit:
cvs rdiff -u -r1.302.4.1 -r1.302.4.2 src/sys/kern/uipc_socket.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.302.4.1 src/sys/kern/uipc_socket.c:1.302.4.2
--- src/sys/kern/uipc_socket.c:1.302.4.1 Sun Feb 4 11:20:15 2024
+++ src/sys/kern/uipc_socket.c Sat Jul 20 14:37:05 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.302.4.1 2024/02/04 11:20:15 martin Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.302.4.2 2024/07/20 14:37:05 martin Exp $ */
/*
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.302.4.1 2024/02/04 11:20:15 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.302.4.2 2024/07/20 14:37:05 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -81,6 +81,7 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_socket.
#include "opt_somaxkva.h"
#include "opt_multiprocessor.h" /* XXX */
#include "opt_sctp.h"
+#include "opt_pipe.h"
#endif
#include <sys/param.h>
@@ -2394,6 +2395,16 @@ soo_kqfilter(struct file *fp, struct kno
case EVFILT_WRITE:
kn->kn_fop = &sowrite_filtops;
sb = &so->so_snd;
+
+#ifdef PIPE_SOCKETPAIR
+ if (so->so_state & SS_ISAPIPE) {
+ /* Other end of pipe has been closed. */
+ if (so->so_state & SS_ISDISCONNECTED) {
+ sounlock(so);
+ return EBADF;
+ }
+ }
+#endif
break;
case EVFILT_EMPTY:
kn->kn_fop = &soempty_filtops;
