View | Details | Raw Unified | Return to bug 265087
Collapse All | Expand All

(-)b/sys/kern/sys_generic.c (-3 / +4 lines)
Lines 562-573 dofilewrite(struct thread *td, int fd, struct file *fp, struct uio *auio, Link Here
562 
		ktruio = cloneuio(auio);
 562 
		ktruio = cloneuio(auio);
563 
#endif
 563 
#endif
564 
	cnt = auio->uio_resid;
 564 
	cnt = auio->uio_resid;
565 
	if ((error = fo_write(fp, auio, td->td_ucred, flags, td))) {
 565 
	if ((error = fo_write(fp, auio, td->td_ucred, flags, td)) &&
566 
	    /* Socket layer is responsible for special error handling. */
567 
	    fp->f_type != DTYPE_SOCKET) {
566 
		if (auio->uio_resid != cnt && (error == ERESTART ||
 568 
		if (auio->uio_resid != cnt && (error == ERESTART ||
567 
		    error == EINTR || error == EWOULDBLOCK))
 569 
		    error == EINTR || error == EWOULDBLOCK))
568 
			error = 0;
 570 
			error = 0;
569 
		/* Socket layer is responsible for issuing SIGPIPE. */
 571 
		if (error == EPIPE) {
570 
		if (fp->f_type != DTYPE_SOCKET && error == EPIPE) {
571 
			PROC_LOCK(td->td_proc);
 572 
			PROC_LOCK(td->td_proc);
572 
			tdsignal(td, SIGPIPE);
 573 
			tdsignal(td, SIGPIPE);
573 
			PROC_UNLOCK(td->td_proc);
 574 
			PROC_UNLOCK(td->td_proc);
(-)b/sys/kern/sys_socket.c (+6 lines)
Lines 138-143 soo_write(struct file *fp, struct uio *uio, struct ucred *active_cred, Link Here
138 
    int flags, struct thread *td)
 138 
    int flags, struct thread *td)
139 
{
 139 
{
140 
	struct socket *so = fp->f_data;
 140 
	struct socket *so = fp->f_data;
141 
	ssize_t len;
141 
	int error;
 142 
	int error;
142 

          143
          

        

        

          143
          
#ifdef MAC

          144
          
#ifdef MAC

        

  

    
      
            Lines 145-151
          soo_write(struct file *fp, struct uio *uio, struct ucred *active_cred,
      
      
        Link Here
      
    
  

        

          145
          
	if (error)

          146
          
	if (error)

        

        

          146
          
		return (error);

          147
          
		return (error);

        

        

          147
          
#endif

          148
          
#endif

        

            

              
              
              149
              
	len = uio->uio_resid;

            

        

          148
          
	error = sosend(so, 0, uio, 0, 0, 0, uio->uio_td);

          150
          
	error = sosend(so, 0, uio, 0, 0, 0, uio->uio_td);

        

            

              
              
              151
              
	if (uio->uio_resid != len &&

            

            

              152
              
	    (so->so_proto->pr_flags & PR_ATOMIC) == 0 &&

            

            

              153
              
	    (error == ERESTART || error == EINTR || error == EWOULDBLOCK))

            

            

              154
              
		error = 0;

            

        

          149
          
	if (error == EPIPE && (so->so_options & SO_NOSIGPIPE) == 0) {

          155
          
	if (error == EPIPE && (so->so_options & SO_NOSIGPIPE) == 0) {

        

        

          150
          
		PROC_LOCK(uio->uio_td->td_proc);

          156
          
		PROC_LOCK(uio->uio_td->td_proc);

        

        

          151
          
		tdsignal(uio->uio_td, SIGPIPE);

          157
          
		tdsignal(uio->uio_td, SIGPIPE);

        






  

  Return to bug 265087