From owner-cvs-src@FreeBSD.ORG Sun Jul 3 01:06:55 2005 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D75E416AC45; Sun, 3 Jul 2005 00:57:54 +0000 (GMT) (envelope-from ps@mu.org) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id B684B4425D; Sun, 3 Jul 2005 00:40:35 +0000 (GMT) (envelope-from ps@mu.org) Received: by elvis.mu.org (Postfix, from userid 1000) id C36DD6DADB; Sat, 2 Jul 2005 17:37:51 -0700 (PDT) X-Original-To: ps@mu.org Delivered-To: ps@mu.org Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by elvis.mu.org (Postfix) with ESMTP id 45CD25C98A for ; Sat, 19 Feb 2005 12:56:16 -0800 (PST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 222395621E for ; Sat, 19 Feb 2005 20:56:16 +0000 (GMT) (envelope-from owner-src-committers@FreeBSD.org) Received: by hub.freebsd.org (Postfix) id A3F0D16A552; Sat, 19 Feb 2005 20:56:10 +0000 (GMT) Delivered-To: ps@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 538) id 56C7E16A4D0; Sat, 19 Feb 2005 20:56:09 +0000 (GMT) Delivered-To: src-committers@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6A93B16A4CE; Sat, 19 Feb 2005 20:56:08 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5221D43D31; Sat, 19 Feb 2005 20:56:08 +0000 (GMT) (envelope-from glebius@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1JKu8v9062202; Sat, 19 Feb 2005 20:56:08 GMT (envelope-from glebius@repoman.freebsd.org) Received: (from glebius@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1JKu8qR062201; Sat, 19 Feb 2005 20:56:08 GMT (envelope-from glebius) Message-Id: <200502192056.j1JKu8qR062201@repoman.freebsd.org> From: Gleb Smirnoff To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_5 Sender: owner-src-committers@FreeBSD.org Precedence: bulk X-Loop: FreeBSD.ORG X-Spam-Checker-Version: SpamAssassin 3.0.2 (2004-11-16) on elvis.mu.org X-Spam-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00, J_CHICKENPOX_52, SARE_SUB_GAPPY_3 autolearn=no version=3.0.2 X-Spam-Level: Cc: Subject: cvs commit: src/sys/kern uipc_socket.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Sun, 03 Jul 2005 01:06:56 -0000 X-Original-Date: Sat, 19 Feb 2005 20:56:08 +0000 (UTC) X-List-Received-Date: Sun, 03 Jul 2005 01:06:56 -0000 glebius 2005-02-19 20:56:08 UTC FreeBSD src repository Modified files: (Branch: RELENG_5) sys/kern uipc_socket.c Log: Apply a workaround for problem fixed in sys/socketvar.h rev. 1.137. We can't MFC socketvar.h since it will break ABI between kernel and several modules. This workaround saves sb_state in local variable and restores it after bzero(). Original commit log of socketvar.h and problem description: Move sb_state to the beginning of structure, above sb_startzero member. sb_state shouldn't be erased, when socket buffer is flushed by sorflush(). When sb_state was bzero'ed, a recently set SBS_CANTRCVMORE flag was cleared. If a socket was shutdown(SHUT_RD), a subsequent read() would block on it. Reported by: Ed Maste, Gerrit Nagelhout Reviewed by: rwatson Revision Changes Path 1.208.2.11 +8 -0 src/sys/kern/uipc_socket.c