From bcad1ab7067d6d1c40ffeec4274461e0ba54ef59 Mon Sep 17 00:00:00 2001 From: mvs Date: Sat, 3 Sep 2022 13:29:33 +0000 Subject: [PATCH] Fix socket splicing between inet and inet6 sockets broken by PRU_CONTROL request splitting to (*pru_control)(). ok bluhm@ --- sys/kern/uipc_socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 0edc11ee7b0..d2b75a3d67f 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket.c,v 1.286 2022/08/28 18:43:12 mvs Exp $ */ +/* $OpenBSD: uipc_socket.c,v 1.287 2022/09/03 13:29:33 mvs Exp $ */ /* $NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $ */ /* @@ -1293,7 +1293,7 @@ sosplice(struct socket *so, int fd, off_t max, struct timeval *tv) if ((error = getsock(curproc, fd, &fp)) != 0) return (error); sosp = fp->f_data; - if (sosp->so_proto->pr_usrreqs != so->so_proto->pr_usrreqs) { + if (sosp->so_proto->pr_type != so->so_proto->pr_type) { error = EPROTONOSUPPORT; goto frele; } -- 2.20.1