From owner-freebsd-bugs@FreeBSD.ORG Sun Mar 6 02:50:18 2005 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2527716A4CE for ; Sun, 6 Mar 2005 02:50:18 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD33743D3F for ; Sun, 6 Mar 2005 02:50:17 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id j262oH3a075540 for ; Sun, 6 Mar 2005 02:50:17 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id j262oHSg075539; Sun, 6 Mar 2005 02:50:17 GMT (envelope-from gnats) Resent-Date: Sun, 6 Mar 2005 02:50:17 GMT Resent-Message-Id: <200503060250.j262oHSg075539@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, =?ISO-8859-1?Q?Mikko_Ty=F6l=E4j=E4rvi?= Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 54AAB16A4CE for ; Sun, 6 Mar 2005 02:50:15 +0000 (GMT) Received: from ylpvm15.prodigy.net (ylpvm15-ext.prodigy.net [207.115.57.46]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE63043D2D for ; Sun, 6 Mar 2005 02:50:14 +0000 (GMT) (envelope-from mbsd@pacbell.net) Received: from antec.home (adsl-64-168-24-254.dsl.snfc21.pacbell.net [64.168.24.254])j262k6EN029585 for ; Sat, 5 Mar 2005 21:46:06 -0500 Message-Id: <20050305184839.N693@antec.home> Date: Sat, 5 Mar 2005 18:50:12 -0800 (PST) From: =?ISO-8859-1?Q?Mikko_Ty=F6l=E4j=E4rvi?= To: FreeBSD-gnats-submit@FreeBSD.org Subject: kern/78478: Writing to closed socket does not generate SIGPIPE X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Mar 2005 02:50:18 -0000 >Number: 78478 >Category: kern >Synopsis: writing to closed socket does not generate SIGPIPE >Confidential: no >Severity: serious >Priority: high >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Mar 06 02:50:17 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Mikko Tyolajarvi >Release: FreeBSD 6.0-CURRENT i386 >Organization: >Environment: System: FreeBSD sotec.home 6.0-CURRENT FreeBSD 6.0-CURRENT #28: Sat Mar 5 16:58:15 PST 2005 mikko@sotec.home:/usr/obj/usr/src/sys/SOTEC i386 5.3-RELEASE, 5-STABLE, 6-CURRENT all behave the same. >Description: Using write(2) to write to a connected socket, IP or unix domain, where the other end has closed the connection should result in a SIGPIPE signal being generated, and does so on FreeBSD 4.11 (as well as Solaris 2.6, 8 & 10, HPUX 11.00 & 11.22, Linux 2.4 & 2.6 etc). Using send(2) instead of write(2) does produce the signal, as does write(2) to a pipe. It is only the combination of write(2) and a stream socket that does not work. >How-To-Repeat: #include #include #include #include #include #include #include #include #include #include #include #include static void gotpipe(int sig) { printf("SIGPIPE\n"); exit(0); } int main(int argc, char *argv[]) { char data[32 * 1024]; int sock, lsock, asock; socklen_t len; int i, use_send, set_nosigpipe; struct sockaddr_in ia; use_send = (argc > 1 && strchr(argv[1], 's')); set_nosigpipe = (argc > 1 && strchr(argv[1], 'n')); signal(SIGPIPE, gotpipe); lsock = socket(AF_INET, SOCK_STREAM, 0); memset(&ia, 0, sizeof(ia)); ia.sin_addr.s_addr = htonl(INADDR_LOOPBACK); bind(lsock, (struct sockaddr *)&ia, sizeof(ia)); listen(lsock, 5); len = sizeof(ia); if (getsockname(lsock, (struct sockaddr *)&ia, &len) < 0) { perror("getsockname"); return 1; } sock = socket(AF_INET, SOCK_STREAM, 0); if (connect(sock, (struct sockaddr *)&ia, sizeof(ia)) < 0) { perror("connect"); return 1; } asock = accept(lsock, NULL, NULL); close(lsock); close(asock); #ifdef SO_NOSIGPIPE if (set_nosigpipe) { i = 1; if (setsockopt(sock, SOL_SOCKET, SO_NOSIGPIPE, &i, sizeof(i)) < 0) { perror("setsockopt"); } } len = sizeof(i); if (getsockopt(sock, SOL_SOCKET, SO_NOSIGPIPE, &i, &len) < 0) { perror("getsockopt"); return 1; } printf("SO_NOSIGPIPE is %d\n", i); #else printf("SO_NOSIGPIPE not supported\n"); #endif for (i = 0; i < 4; i++) { if (use_send) { if (send(sock, data, sizeof(data), 0) < 0) { perror("send"); } } else { if (write(sock, data, sizeof(data)) < 0) { perror("write"); } } } printf("No sigpipe\n"); return 1; } >Fix: This seems to be one way to solve the problem: Index: sys_socket.c =================================================================== RCS file: /home/ncvs/src/sys/kern/sys_socket.c,v retrieving revision 1.67 diff -b -u -r1.67 sys_socket.c --- sys_socket.c 6 Jan 2005 23:35:39 -0000 1.67 +++ sys_socket.c 6 Mar 2005 02:44:58 -0000 @@ -39,8 +39,11 @@ #include #include #include +#include #include #include +#include +#include #include #include #include /* XXX */ @@ -115,6 +118,13 @@ error = so->so_proto->pr_usrreqs->pru_sosend(so, 0, uio, 0, 0, 0, uio->uio_td); NET_UNLOCK_GIANT(); + + /* Generation of SIGPIPE can be controlled per socket */ + if (error == EPIPE && !(so->so_options & SO_NOSIGPIPE)) { + PROC_LOCK(td->td_proc); + psignal(td->td_proc, SIGPIPE); + PROC_UNLOCK(td->td_proc); + } return (error); } >Release-Note: >Audit-Trail: >Unformatted: