[src/trunk]: src/sys/kern Revise previous fix:

[sommerfeld <sommerfeld%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/aecbe71bb6e4
branches:  trunk
changeset: 472993:aecbe71bb6e4
user:      sommerfeld <sommerfeld%NetBSD.org@localhost>
date:      Sat May 15 22:36:34 1999 +0000

description:
Revise previous fix:
        1) protect socket flags under splsoftnet()
        2) avoid leaking memory on an error

diffstat:

 sys/kern/uipc_socket.c |  31 ++++++++++++++++++++-----------
 1 files changed, 20 insertions(+), 11 deletions(-)

diffs (54 lines):

diff -r 350a1c57bb9d -r aecbe71bb6e4 sys/kern/uipc_socket.c
--- a/sys/kern/uipc_socket.c    Sat May 15 19:29:12 1999 +0000
+++ b/sys/kern/uipc_socket.c    Sat May 15 22:36:34 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_socket.c,v 1.45 1999/05/15 16:42:48 tv Exp $      */
+/*     $NetBSD: uipc_socket.c,v 1.46 1999/05/15 22:36:34 sommerfeld Exp $      */
 
 /*
  * Copyright (c) 1982, 1986, 1988, 1990, 1993
@@ -492,25 +492,34 @@
                                        break;
                                }
                        } while (space > 0 && atomic);
+                       
+#ifdef TEST_FOR_PANIC_UIPC_3_RACE_CONDITION
+                       {
+                               extern struct domain unixdomain;
+                               
+                               if (so->so_proto->pr_domain == &unixdomain)
+                                       sleep(&lbolt, PVFS);
+                       }
+#endif
+                       
+                       s = splsoftnet();
+
+                       if (so->so_state & SS_CANTSENDMORE)
+                               snderr(EPIPE);
 
                        if (dontroute)
                                so->so_options |= SO_DONTROUTE;
                        if (resid > 0)
                                so->so_state |= SS_MORETOCOME;
-
-                       s = splsoftnet();                       /* XXX */
-                       if (so->so_state & SS_CANTSENDMORE)
-                               error = EPIPE;
-                       else
-                               error = (*so->so_proto->pr_usrreq)(so,
-                                       (flags & MSG_OOB) ? PRU_SENDOOB : PRU_SEND,
-                                       top, addr, control, p);
-                       splx(s);
-
+                       error = (*so->so_proto->pr_usrreq)(so,
+                           (flags & MSG_OOB) ? PRU_SENDOOB : PRU_SEND,
+                           top, addr, control, p);
                        if (dontroute)
                                so->so_options &= ~SO_DONTROUTE;
                        if (resid > 0)
                                so->so_state &= ~SS_MORETOCOME;
+                       splx(s);
+
                        clen = 0;
                        control = 0;
                        top = 0;