merge in vnode changes

[unix-history] / usr / src / sys / kern / uipc_syscalls.c

diff --git a/usr/src/sys/kern/uipc_syscalls.c b/usr/src/sys/kern/uipc_syscalls.c
index 727b9dd..c652eb9 100644 (file)
--- a/usr/src/sys/kern/uipc_syscalls.c
+++ b/usr/src/sys/kern/uipc_syscalls.c
@@ -1,24 +1,33 @@
 /*
 /*

- * Copyright (c) 1982 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
+ * All rights reserved.

  *
  *

- *     @(#)uipc_syscalls.c     6.16 (Berkeley) %G%
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *     @(#)uipc_syscalls.c     7.8 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"

-#include "systm.h"

 #include "dir.h"
 #include "user.h"
 #include "proc.h"
 #include "file.h"
 #include "dir.h"
 #include "user.h"
 #include "proc.h"
 #include "file.h"

-#include "inode.h"

 #include "buf.h"
 #include "buf.h"

+#include "malloc.h"

 #include "mbuf.h"
 #include "protosw.h"
 #include "socket.h"
 #include "socketvar.h"
 #include "mbuf.h"
 #include "protosw.h"
 #include "socket.h"
 #include "socketvar.h"

-#include "uio.h"

 
 /*
  * System call interface to the socket abstraction.
 
 /*
  * System call interface to the socket abstraction.


@@ -86,7 +95,21 @@ listen()
        u.u_error = solisten((struct socket *)fp->f_data, uap->backlog);
 }
 
        u.u_error = solisten((struct socket *)fp->f_data, uap->backlog);
 }
 

+#ifdef COMPAT_43
+accept()
+{
+       accept1(0);
+}
+
+oaccept()
+{
+       accept1(1);
+}
+
+accept1(compat_43)
+#else

 accept()
 accept()

+#endif

 {
        register struct a {
                int     s;
 {
        register struct a {
                int     s;


@@ -160,6 +183,11 @@ noname:
        nam = m_get(M_WAIT, MT_SONAME);
        (void) soaccept(so, nam);
        if (uap->name) {
        nam = m_get(M_WAIT, MT_SONAME);
        (void) soaccept(so, nam);
        if (uap->name) {

+#ifdef COMPAT_43
+               if (compat_43)
+                       mtod(nam, struct osockaddr *)->sa_family =
+                           mtod(nam, struct sockaddr *)->sa_family;
+#endif

                if (namelen > nam->m_len)
                        namelen = nam->m_len;
                /* SHOULD COPY OUT A CHAIN HERE */
                if (namelen > nam->m_len)
                        namelen = nam->m_len;
                /* SHOULD COPY OUT A CHAIN HERE */


@@ -190,7 +218,7 @@ connect()
        so = (struct socket *)fp->f_data;
        if ((so->so_state & SS_NBIO) &&
            (so->so_state & SS_ISCONNECTING)) {
        so = (struct socket *)fp->f_data;
        if ((so->so_state & SS_NBIO) &&
            (so->so_state & SS_ISCONNECTING)) {

-               u.u_error = EINPROGRESS;
+               u.u_error = EALREADY;

                return;
        }
        u.u_error = sockargs(&nam, uap->name, uap->namelen, MT_SONAME);
                return;
        }
        u.u_error = sockargs(&nam, uap->name, uap->namelen, MT_SONAME);


@@ -199,6 +227,12 @@ connect()
        u.u_error = soconnect(so, nam);
        if (u.u_error)
                goto bad;
        u.u_error = soconnect(so, nam);
        if (u.u_error)
                goto bad;

+       if ((so->so_state & SS_NBIO) &&
+           (so->so_state & SS_ISCONNECTING)) {
+               u.u_error = EINPROGRESS;
+               m_freem(nam);
+               return;
+       }

        s = splnet();
        if (setjmp(&u.u_qsave)) {
                if (u.u_error == 0)
        s = splnet();
        if (setjmp(&u.u_qsave)) {
                if (u.u_error == 0)


@@ -237,7 +271,7 @@ socketpair()
                return;
        u.u_error = socreate(uap->domain, &so2, uap->type, uap->protocol);
        if (u.u_error)
                return;
        u.u_error = socreate(uap->domain, &so2, uap->type, uap->protocol);
        if (u.u_error)

-               goto free;
+               goto freeit;

        fp1 = falloc();
        if (fp1 == NULL)
                goto free2;
        fp1 = falloc();
        if (fp1 == NULL)
                goto free2;


@@ -276,7 +310,7 @@ free3:
        u.u_ofile[sv[0]] = 0;
 free2:
        (void)soclose(so2);
        u.u_ofile[sv[0]] = 0;
 free2:
        (void)soclose(so2);

-free:
+freeit:

        (void)soclose(so1);
 }
 
        (void)soclose(so1);
 }
 


@@ -300,11 +334,13 @@ sendto()
        aiov.iov_base = uap->buf;
        aiov.iov_len = uap->len;
        msg.msg_accrights = 0;
        aiov.iov_base = uap->buf;
        aiov.iov_len = uap->len;
        msg.msg_accrights = 0;

-       msg.msg_accrightslen = 0;
+       msg.msg_control = 0;

        sendit(uap->s, &msg, uap->flags);
 }
 
        sendit(uap->s, &msg, uap->flags);
 }
 

-send()
+#ifdef COMPAT_43
+
+osend()

 {
        register struct a {
                int     s;
 {
        register struct a {
                int     s;


@@ -322,10 +358,37 @@ send()
        aiov.iov_base = uap->buf;
        aiov.iov_len = uap->len;
        msg.msg_accrights = 0;
        aiov.iov_base = uap->buf;
        aiov.iov_len = uap->len;
        msg.msg_accrights = 0;

-       msg.msg_accrightslen = 0;
+       msg.msg_control = 0;

        sendit(uap->s, &msg, uap->flags);
 }
 
        sendit(uap->s, &msg, uap->flags);
 }
 

+osendmsg()
+{
+       register struct a {
+               int     s;
+               caddr_t msg;
+               int     flags;
+       } *uap = (struct a *)u.u_ap;
+       struct msghdr msg;
+       struct iovec aiov[MSG_MAXIOVLEN];
+
+       u.u_error = copyin(uap->msg, (caddr_t)&msg, sizeof (struct omsghdr));
+       if (u.u_error)
+               return;
+       if ((u_int)msg.msg_iovlen >= sizeof (aiov) / sizeof (aiov[0])) {
+               u.u_error = EMSGSIZE;
+               return;
+       }
+       u.u_error = copyin((caddr_t)msg.msg_iov, (caddr_t)aiov,
+               (unsigned)(msg.msg_iovlen * sizeof (aiov[0])));
+       if (u.u_error)
+               return;
+       msg.msg_control = 0;
+       msg.msg_controllen = 0;
+       sendit(uap->s, &msg, uap->flags);
+}
+#endif
+

 sendmsg()
 {
        register struct a {
 sendmsg()
 {
        register struct a {


@@ -343,8 +406,7 @@ sendmsg()
                u.u_error = EMSGSIZE;
                return;
        }
                u.u_error = EMSGSIZE;
                return;
        }

-       u.u_error =
-           copyin((caddr_t)msg.msg_iov, (caddr_t)aiov,
+       u.u_error = copyin((caddr_t)msg.msg_iov, (caddr_t)aiov,

                (unsigned)(msg.msg_iovlen * sizeof (aiov[0])));
        if (u.u_error)
                return;
                (unsigned)(msg.msg_iovlen * sizeof (aiov[0])));
        if (u.u_error)
                return;


@@ -361,7 +423,7 @@ sendit(s, mp, flags)
        struct uio auio;
        register struct iovec *iov;
        register int i;
        struct uio auio;
        register struct iovec *iov;
        register int i;

-       struct mbuf *to, *rights;
+       struct mbuf *to, *rights, *control;

        int len;
        
        fp = getsock(s);
        int len;
        
        fp = getsock(s);


@@ -401,19 +463,53 @@ sendit(s, mp, flags)
                        goto bad;
        } else
                rights = 0;
                        goto bad;
        } else
                rights = 0;

+       if (mp->msg_control) {
+               u.u_error =
+                   sockargs(&control, mp->msg_control, mp->msg_controllen,
+                   MT_CONTROL);
+               if (u.u_error)
+                       goto bad;
+       } else
+               control = 0;

        len = auio.uio_resid;
        len = auio.uio_resid;

-       u.u_error =
-           sosend((struct socket *)fp->f_data, to, &auio, flags, rights);
+       if (setjmp(&u.u_qsave)) {                       /* XXX */
+               if (auio.uio_resid == len) {
+                       if ((u.u_sigintr & sigmask(u.u_procp->p_cursig)) != 0)
+                               u.u_error = EINTR;
+                       else
+                               u.u_eosys = RESTARTSYS;
+               }
+       } else
+               u.u_error = sosend((struct socket *)fp->f_data, to, &auio,
+                   flags, rights, control);

        u.u_r.r_val1 = len - auio.uio_resid;
        u.u_r.r_val1 = len - auio.uio_resid;

+bad:

        if (rights)
                m_freem(rights);
        if (rights)
                m_freem(rights);

-bad:

        if (to)
                m_freem(to);
        if (to)
                m_freem(to);

+       if (control)
+               m_freem(control);
+}
+
+#ifdef COMPAT_43
+recvfrom()
+{
+       recvfrom1(0);
+}
+
+orecvfrom()
+{
+       recvfrom1(1);

 }
 
 }
 

+recvfrom1(compat_43)
+{      /* vi will want an extra } to be happy! */
+#else

 recvfrom()
 {
 recvfrom()
 {

+       int compat_43 = 0;
+#endif

        register struct a {
                int     s;
                caddr_t buf;
        register struct a {
                int     s;
                caddr_t buf;


@@ -426,10 +522,13 @@ recvfrom()
        struct iovec aiov;
        int len;
 
        struct iovec aiov;
        int len;
 

-       u.u_error = copyin((caddr_t)uap->fromlenaddr, (caddr_t)&len,
-          sizeof (len));
-       if (u.u_error)
-               return;
+       if (uap->fromlenaddr) {
+               u.u_error = copyin((caddr_t)uap->fromlenaddr, (caddr_t)&len,
+                  sizeof (len));
+               if (u.u_error)
+                       return;
+       } else
+               len = 0;

        msg.msg_name = uap->from;
        msg.msg_namelen = len;
        msg.msg_iov = &aiov;
        msg.msg_name = uap->from;
        msg.msg_namelen = len;
        msg.msg_iov = &aiov;


@@ -437,11 +536,12 @@ recvfrom()
        aiov.iov_base = uap->buf;
        aiov.iov_len = uap->len;
        msg.msg_accrights = 0;
        aiov.iov_base = uap->buf;
        aiov.iov_len = uap->len;
        msg.msg_accrights = 0;

-       msg.msg_accrightslen = 0;
-       recvit(uap->s, &msg, uap->flags, (caddr_t)uap->fromlenaddr, (caddr_t)0);
+       msg.msg_control = 0;
+       msg.msg_flags = uap->flags;
+       recvit(uap->s, &msg, (caddr_t)uap->fromlenaddr, (caddr_t)0, compat_43);

 }
 }

-
-recv()
+#ifdef COMPAT_43
+orecv()

 {
        register struct a {
                int     s;
 {
        register struct a {
                int     s;


@@ -459,10 +559,48 @@ recv()
        aiov.iov_base = uap->buf;
        aiov.iov_len = uap->len;
        msg.msg_accrights = 0;
        aiov.iov_base = uap->buf;
        aiov.iov_len = uap->len;
        msg.msg_accrights = 0;

-       msg.msg_accrightslen = 0;
-       recvit(uap->s, &msg, uap->flags, (caddr_t)0, (caddr_t)0);
+       msg.msg_control = 0;
+       msg.msg_flags = uap->flags;
+       recvit(uap->s, &msg, (caddr_t)0, (caddr_t)0, 0);

 }
 
 }
 

+orecvmsg()
+{
+       register struct a {
+               int     s;
+               struct  omsghdr *msg;
+               int     flags;
+       } *uap = (struct a *)u.u_ap;
+       struct msghdr msg;
+       struct iovec aiov[MSG_MAXIOVLEN];
+
+       u.u_error = copyin((caddr_t)uap->msg, (caddr_t)&msg,
+           sizeof (struct omsghdr));
+       if (u.u_error)
+               return;
+       if ((u_int)msg.msg_iovlen >= sizeof (aiov) / sizeof (aiov[0])) {
+               u.u_error = EMSGSIZE;
+               return;
+       }
+       msg.msg_control = 0;
+       msg.msg_flags = uap->flags;
+       u.u_error = copyin((caddr_t)msg.msg_iov, (caddr_t)aiov,
+               (unsigned)(msg.msg_iovlen * sizeof (aiov[0])));
+       if (u.u_error)
+               return;
+       msg.msg_iov = aiov;
+       if (msg.msg_accrights)
+               if (useracc((caddr_t)msg.msg_accrights,
+                   (unsigned)msg.msg_accrightslen, B_WRITE) == 0) {
+                       u.u_error = EFAULT;
+                       return;
+               }
+           
+       recvit(uap->s, &msg, (caddr_t)&uap->msg->msg_namelen,
+           (caddr_t)&uap->msg->msg_accrightslen, /* compat_43 */1);
+}
+#endif
+

 recvmsg()
 {
        register struct a {
 recvmsg()
 {
        register struct a {


@@ -471,7 +609,7 @@ recvmsg()
                int     flags;
        } *uap = (struct a *)u.u_ap;
        struct msghdr msg;
                int     flags;
        } *uap = (struct a *)u.u_ap;
        struct msghdr msg;

-       struct iovec aiov[MSG_MAXIOVLEN];
+       struct iovec aiov[MSG_MAXIOVLEN], *uiov;

 
        u.u_error = copyin((caddr_t)uap->msg, (caddr_t)&msg, sizeof (msg));
        if (u.u_error)
 
        u.u_error = copyin((caddr_t)uap->msg, (caddr_t)&msg, sizeof (msg));
        if (u.u_error)


@@ -480,11 +618,12 @@ recvmsg()
                u.u_error = EMSGSIZE;
                return;
        }
                u.u_error = EMSGSIZE;
                return;
        }

-       u.u_error =
-           copyin((caddr_t)msg.msg_iov, (caddr_t)aiov,
+       msg.msg_flags = uap->flags;
+       u.u_error = copyin((caddr_t)msg.msg_iov, (caddr_t)aiov,

                (unsigned)(msg.msg_iovlen * sizeof (aiov[0])));
        if (u.u_error)
                return;
                (unsigned)(msg.msg_iovlen * sizeof (aiov[0])));
        if (u.u_error)
                return;

+       uiov = msg.msg_iov;

        msg.msg_iov = aiov;
        if (msg.msg_accrights)
                if (useracc((caddr_t)msg.msg_accrights,
        msg.msg_iov = aiov;
        if (msg.msg_accrights)
                if (useracc((caddr_t)msg.msg_accrights,


@@ -492,23 +631,28 @@ recvmsg()
                        u.u_error = EFAULT;
                        return;
                }
                        u.u_error = EFAULT;
                        return;
                }

-       recvit(uap->s, &msg, uap->flags,
-           (caddr_t)&uap->msg->msg_namelen,
-           (caddr_t)&uap->msg->msg_accrightslen);
+       if (msg.msg_control)
+               if (useracc((caddr_t)msg.msg_control,
+                   (unsigned)msg.msg_controllen, B_WRITE) == 0) {
+                       u.u_error = EFAULT;
+                       return;
+               }
+       recvit(uap->s, &msg, (caddr_t)0, (caddr_t)0, 0);
+       msg.msg_iov = uiov;
+       u.u_error = copyout((caddr_t)&msg, (caddr_t)uap->msg, sizeof(msg));

 }
 
 }
 

-recvit(s, mp, flags, namelenp, rightslenp)
-       int s;
+recvit(s, mp, namelenp, rightslenp, compat_43)
+       int s, compat_43;

        register struct msghdr *mp;
        register struct msghdr *mp;

-       int flags;

        caddr_t namelenp, rightslenp;
 {
        register struct file *fp;
        struct uio auio;
        register struct iovec *iov;
        register int i;
        caddr_t namelenp, rightslenp;
 {
        register struct file *fp;
        struct uio auio;
        register struct iovec *iov;
        register int i;

-       struct mbuf *from, *rights;

        int len;
        int len;

+       struct mbuf *from = 0, *rights = 0, *control = 0;

        
        fp = getsock(s);
        if (fp == 0)
        
        fp = getsock(s);
        if (fp == 0)


@@ -533,21 +677,35 @@ recvit(s, mp, flags, namelenp, rightslenp)
                auio.uio_resid += iov->iov_len;
        }
        len = auio.uio_resid;
                auio.uio_resid += iov->iov_len;
        }
        len = auio.uio_resid;

-       u.u_error =
-           soreceive((struct socket *)fp->f_data, &from, &auio,
-               flags, &rights);
+       if (setjmp(&u.u_qsave)) {                       /* XXX */
+               if (auio.uio_resid == len) {
+                       if ((u.u_sigintr & sigmask(u.u_procp->p_cursig)) != 0)
+                               u.u_error = EINTR;
+                       else
+                               u.u_eosys = RESTARTSYS;
+               }
+       } else
+               u.u_error = soreceive((struct socket *)fp->f_data, &from, &auio,
+                   &mp->msg_flags, &rights, &control);

        u.u_r.r_val1 = len - auio.uio_resid;
        if (mp->msg_name) {
                len = mp->msg_namelen;
                if (len <= 0 || from == 0)
                        len = 0;
                else {
        u.u_r.r_val1 = len - auio.uio_resid;
        if (mp->msg_name) {
                len = mp->msg_namelen;
                if (len <= 0 || from == 0)
                        len = 0;
                else {

-                       if (len > from->m_len)
+#ifdef COMPAT_43
+                       if (compat_43)
+                               mtod(from, struct osockaddr *)->sa_family =
+                                   mtod(from, struct sockaddr *)->sa_family;
+#endif
+                       if (len > from->m_len)          /* ??? */

                                len = from->m_len;
                                len = from->m_len;

-                       (void) copyout((caddr_t)mtod(from, caddr_t),
+                       (void) copyout(mtod(from, caddr_t),

                            (caddr_t)mp->msg_name, (unsigned)len);
                }
                            (caddr_t)mp->msg_name, (unsigned)len);
                }

-               (void) copyout((caddr_t)&len, namelenp, sizeof (int));
+               mp->msg_namelen = len;
+               if (namelenp)
+                       (void) copyout((caddr_t)&len, namelenp, sizeof (int));

        }
        if (mp->msg_accrights) {
                len = mp->msg_accrightslen;
        }
        if (mp->msg_accrights) {
                len = mp->msg_accrightslen;


@@ -559,12 +717,30 @@ recvit(s, mp, flags, namelenp, rightslenp)
                        (void) copyout((caddr_t)mtod(rights, caddr_t),
                            (caddr_t)mp->msg_accrights, (unsigned)len);
                }
                        (void) copyout((caddr_t)mtod(rights, caddr_t),
                            (caddr_t)mp->msg_accrights, (unsigned)len);
                }

-               (void) copyout((caddr_t)&len, rightslenp, sizeof (int));
+               mp->msg_accrightslen = len;
+               if (rightslenp)
+                       (void) copyout((caddr_t)&len, rightslenp, sizeof (int));
+       }
+       if (mp->msg_control) {
+               len = mp->msg_controllen;
+               if (len <= 0 || control == 0)
+                       len = 0;
+               else {
+                       if (len >= control->m_len)
+                               len = control->m_len;
+                       else
+                               mp->msg_flags |= MSG_CTRUNC;
+                       (void) copyout((caddr_t)mtod(control, caddr_t),
+                           (caddr_t)mp->msg_control, (unsigned)len);
+               }
+               mp->msg_controllen = len;

        }
        if (rights)
                m_freem(rights);
        if (from)
                m_freem(from);
        }
        if (rights)
                m_freem(rights);
        if (from)
                m_freem(from);

+       if (control)
+               m_freem(control);

 }
 
 shutdown()
 }
 
 shutdown()


@@ -670,7 +846,7 @@ pipe()
                return;
        u.u_error = socreate(AF_UNIX, &wso, SOCK_STREAM, 0);
        if (u.u_error)
                return;
        u.u_error = socreate(AF_UNIX, &wso, SOCK_STREAM, 0);
        if (u.u_error)

-               goto free;
+               goto freeit;

        rf = falloc();
        if (rf == NULL)
                goto free2;
        rf = falloc();
        if (rf == NULL)
                goto free2;


@@ -701,14 +877,28 @@ free3:
        u.u_ofile[r] = 0;
 free2:
        (void)soclose(wso);
        u.u_ofile[r] = 0;
 free2:
        (void)soclose(wso);

-free:
+freeit:

        (void)soclose(rso);
 }
 
 /*
  * Get socket name.
  */
        (void)soclose(rso);
 }
 
 /*
  * Get socket name.
  */

+#ifdef COMPAT_43

 getsockname()
 getsockname()

+{
+       getsockname1(0);
+}
+
+ogetsockname()
+{
+       getsockname1(1);
+}
+
+getsockname1(compat_43)
+#else
+getsockname()
+#endif

 {
        register struct a {
                int     fdes;
 {
        register struct a {
                int     fdes;


@@ -737,10 +927,15 @@ getsockname()
                goto bad;
        if (len > m->m_len)
                len = m->m_len;
                goto bad;
        if (len > m->m_len)
                len = m->m_len;

+#ifdef COMPAT_43
+       if (compat_43)
+               mtod(m, struct osockaddr *)->sa_family =
+                   mtod(m, struct sockaddr *)->sa_family;
+#endif

        u.u_error = copyout(mtod(m, caddr_t), (caddr_t)uap->asa, (u_int)len);
        u.u_error = copyout(mtod(m, caddr_t), (caddr_t)uap->asa, (u_int)len);

-       if (u.u_error)
-               goto bad;
-       u.u_error = copyout((caddr_t)&len, (caddr_t)uap->alen, sizeof (len));
+       if (u.u_error == 0)
+               u.u_error = copyout((caddr_t)&len, (caddr_t)uap->alen,
+                   sizeof (len));

 bad:
        m_freem(m);
 }
 bad:
        m_freem(m);
 }


@@ -748,7 +943,21 @@ bad:
 /*
  * Get name of peer for connected socket.
  */
 /*
  * Get name of peer for connected socket.
  */

+#ifdef COMPAT_43
+getpeername()
+{
+       getpeername1(0);
+}
+
+ogetpeername()
+{
+       getpeername1(1);
+}
+
+getpeername1(compat_43)
+#else

 getpeername()
 getpeername()

+#endif

 {
        register struct a {
                int     fdes;
 {
        register struct a {
                int     fdes;


@@ -781,6 +990,11 @@ getpeername()
                goto bad;
        if (len > m->m_len)
                len = m->m_len;
                goto bad;
        if (len > m->m_len)
                len = m->m_len;

+#ifdef COMPAT_43
+       if (compat_43)
+               mtod(m, struct osockaddr *)->sa_family =
+                   mtod(m, struct sockaddr *)->sa_family;
+#endif

        u.u_error = copyout(mtod(m, caddr_t), (caddr_t)uap->asa, (u_int)len);
        if (u.u_error)
                goto bad;
        u.u_error = copyout(mtod(m, caddr_t), (caddr_t)uap->asa, (u_int)len);
        if (u.u_error)
                goto bad;


@@ -797,7 +1011,7 @@ sockargs(aname, name, namelen, type)
        register struct mbuf *m;
        int error;
 
        register struct mbuf *m;
        int error;
 

-       if (namelen > MLEN)
+       if ((u_int)namelen > MLEN)

                return (EINVAL);
        m = m_get(M_WAIT, type);
        if (m == NULL)
                return (EINVAL);
        m = m_get(M_WAIT, type);
        if (m == NULL)


@@ -808,6 +1022,14 @@ sockargs(aname, name, namelen, type)
                (void) m_free(m);
        else
                *aname = m;
                (void) m_free(m);
        else
                *aname = m;

+       if (type == MT_SONAME) {
+               register struct sockaddr *sa = mtod(m, struct sockaddr *);
+#if defined(COMPAT_43) && BYTE_ORDER != BIG_ENDIAN
+               if (sa->sa_family == 0 && sa->sa_len < AF_MAX)
+                       sa->sa_family = sa->sa_len;
+#endif
+               sa->sa_len = namelen;
+       }

        return (error);
 }
 
        return (error);
 }