Home Home > GIT Browse
diff options
authorDavid S. Miller <davem@davemloft.net>2007-10-18 18:47:05 +0200
committerAdrian Bunk <bunk@kernel.org>2007-10-18 18:47:05 +0200
commit43f903ce5f313983fca91a96f786730cf8c8c645 (patch)
parent9bae2c81c89bed8ddf1334cc3b11ca65385163c0 (diff)
[NET]: Zero length write() on socket should not simply return 0.
This fixes kernel bugzilla #5731 It should generate an empty packet for datagram protocols when the socket is connected, for one. The check is doubly-wrong because all that a write() can be is a sendmsg() call with a NULL msg_control and a single entry iovec. No special semantics should be assigned to it, therefore the zero length check should be removed entirely. This matches the behavior of BSD and several other systems. Alan Cox notes that SuSv3 says the behavior of a zero length write on non-files is "unspecified", but that's kind of useless since BSD has defined this behavior for a quarter century and BSD is essentially what application folks code to. Based upon a patch from Stephen Hemminger. Adrian Bunk: Backported to 2.6.16. Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Adrian Bunk <bunk@kernel.org>
1 files changed, 0 insertions, 2 deletions
diff --git a/net/socket.c b/net/socket.c
index a00851f981db..1230704cd9ca 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -775,8 +775,6 @@ static ssize_t sock_aio_write(struct kiocb *iocb, const char __user *ubuf,
if (pos != 0)
return -ESPIPE;
- if (count == 0) /* Match SYS5 behaviour */
- return 0;
x = alloc_sock_iocb(iocb, (void __user *)ubuf, count, &siocb);
if (!x)