netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Miller <davem@davemloft.net>
To: shemminger@linux-foundation.org
Cc: netdev@vger.kernel.org
Subject: Re: [RFC] Zero-length write() does not generate a datagram on connected socket
Date: Thu, 27 Sep 2007 13:53:34 -0700 (PDT)	[thread overview]
Message-ID: <20070927.135334.56943477.davem@davemloft.net> (raw)
In-Reply-To: <20070924153435.14249225@freepuppy.rosehill>

From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Mon, 24 Sep 2007 15:34:35 -0700

> The bug http://bugzilla.kernel.org/show_bug.cgi?id=5731
> describes an issue where write() can't be used to generate a zero-length
> datagram (but send, and sendto do work).
> 
> I think the following is needed:
> 
> --- a/net/socket.c	2007-08-20 09:54:28.000000000 -0700
> +++ b/net/socket.c	2007-09-24 15:31:25.000000000 -0700
> @@ -777,8 +777,11 @@ static ssize_t sock_aio_write(struct kio
>  	if (pos != 0)
>  		return -ESPIPE;
>  
> -	if (iocb->ki_left == 0)	/* Match SYS5 behaviour */
> -		return 0;
> +	if (unlikely(iocb->ki_left == 0)) {
> +		struct socket *sock = iocb->ki_filp->private_data;
> +		if (sock->type == SOCK_STREAM)
> +			return 0;
> +	}
>  
>  	x = alloc_sock_iocb(iocb, &siocb);
>  	if (!x)

We should simply remove the check completely.

There is no need to add special code for different types of protocols
and sockets.

As is hinted in the bugzilla, the exact same thing can happen with a
suitably constructed sendto() or sendmsg() call.  write() on a socket
is a sendmsg() with a NULL msg_control and a single entry iovec, plain
and simple.

It's how BSD and many other systems behave, and I double checked
Steven's Volume 2 just to make sure.

So I'm going to check in the following to fix this bugzilla.  There is
a similarly ugly test for len==0 in sys_read() on sockets.  If someone
would do some research on the validity of that thing I'd really
appreciate it :-)

diff --git a/net/socket.c b/net/socket.c
index 7d44453..b09eb90 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -777,9 +777,6 @@ static ssize_t sock_aio_write(struct kiocb *iocb, const struct iovec *iov,
 	if (pos != 0)
 		return -ESPIPE;
 
-	if (iocb->ki_left == 0)	/* Match SYS5 behaviour */
-		return 0;
-
 	x = alloc_sock_iocb(iocb, &siocb);
 	if (!x)
 		return -ENOMEM;

  parent reply	other threads:[~2007-09-27 20:53 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <bug-5731-100@http.bugzilla.kernel.org/>
     [not found] ` <20070922094432.E9BEA108010@picon.linux-foundation.org>
2007-09-24 22:34   ` [RFC] Zero-length write() does not generate a datagram on connected socket Stephen Hemminger
2007-09-26  3:18     ` Herbert Xu
2007-09-26  5:36       ` Stephen Hemminger
2007-09-26 17:17       ` Rick Jones
2007-09-26 18:47       ` Vlad Yasevich
2007-09-27 20:53     ` David Miller [this message]
2007-09-27 22:41       ` Stephen Hemminger
2007-09-28  8:49         ` Michael Kerrisk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070927.135334.56943477.davem@davemloft.net \
    --to=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=shemminger@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).