From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161080AbVLWW2n (ORCPT ); Fri, 23 Dec 2005 17:28:43 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1161082AbVLWW2l (ORCPT ); Fri, 23 Dec 2005 17:28:41 -0500 Received: from mail.kroah.org ([69.55.234.183]:34248 "EHLO perch.kroah.org") by vger.kernel.org with ESMTP id S1161076AbVLWW2i (ORCPT ); Fri, 23 Dec 2005 17:28:38 -0500 Date: Fri, 23 Dec 2005 14:27:45 -0800 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org, Arnaldo Carvalho de Melo , netdev@vger.kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Chuck Wolber , torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk, herbert@gondor.apana.org.au, phillips@istop.com Subject: [patch 07/11] NET: Fix zero-size datagram reception Message-ID: <20051223222745.GH18252@kroah.com> References: <20051109182205.294803000@press.kroah.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="fix-zero-size-datagram-reception.patch" In-Reply-To: <20051223222652.GA18252@kroah.com> User-Agent: Mutt/1.5.11 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org From: Herbert Xu The recent rewrite of skb_copy_datagram_iovec broke the reception of zero-size datagrams. This patch fixes it. Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- net/core/datagram.c | 4 ++++ 1 file changed, 4 insertions(+) --- linux-2.6.14.1.orig/net/core/datagram.c +++ linux-2.6.14.1/net/core/datagram.c @@ -213,6 +213,10 @@ int skb_copy_datagram_iovec(const struct { int i, err, fraglen, end = 0; struct sk_buff *next = skb_shinfo(skb)->frag_list; + + if (!len) + return 0; + next_skb: fraglen = skb_headlen(skb); i = -1; --