From akpm@osdl.org Wed Nov 9 16:13:54 2005 Return-Path: X-Original-To: lkml@kolivas.org Delivered-To: lkml@kolivas.org Received: from bhhdoa.org.au (bhhdoa.org.au [65.98.99.88]) by mail.kolivas.org (Postfix) with ESMTP id EEE23C5C96 for ; Wed, 9 Nov 2005 16:14:46 +1100 (EST) Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by bhhdoa.org.au (Postfix) with ESMTP id 9FEC5515D3 for ; Wed, 9 Nov 2005 14:07:42 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030344AbVKIFOT (ORCPT ); Wed, 9 Nov 2005 00:14:19 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S965237AbVKIFOT (ORCPT ); Wed, 9 Nov 2005 00:14:19 -0500 Received: from smtp.osdl.org ([65.172.181.4]:5528 "EHLO smtp.osdl.org") by vger.kernel.org with ESMTP id S965171AbVKIFOT (ORCPT ); Wed, 9 Nov 2005 00:14:19 -0500 Received: from shell0.pdx.osdl.net (fw.osdl.org [65.172.181.6]) by smtp.osdl.org (8.12.8/8.12.8) with ESMTP id jA95E5nO014016 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Tue, 8 Nov 2005 21:14:07 -0800 Received: from bix (shell0.pdx.osdl.net [10.9.0.31]) by shell0.pdx.osdl.net (8.13.1/8.11.6) with SMTP id jA95E4F5007116; Tue, 8 Nov 2005 21:14:04 -0800 Date: Tue, 8 Nov 2005 21:13:54 -0800 From: Andrew Morton To: Greg KH Cc: linux-kernel@vger.kernel.org, stable@kernel.org, torvalds@osdl.org, Herbert Xu Subject: Re: Linux 2.6.14.1 Message-Id: <20051108211354.546e0163.akpm@osdl.org> In-Reply-To: <20051109010729.GA22439@kroah.com> References: <20051109010729.GA22439@kroah.com> X-Mailer: Sylpheed version 1.0.4 (GTK+ 1.2.10; i386-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Status: No, hits=0 required=5 tests= X-Spam-Checker-Version: SpamAssassin 2.63-osdl_revision__1.55__ X-MIMEDefang-Filter: osdl$Revision: 1.127 $ X-Scanned-By: MIMEDefang 2.36 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org Status: RO X-Status: UC X-KMail-EncryptionState: X-KMail-SignatureState: X-KMail-MDN-Sent: Greg KH wrote: > > We (the -stable team) are announcing the release of the 2.6.14.1 kernel. We need the fix for the net-drops-zero-length-udp-messages bug which broke bind and traceroute. Begin forwarded message: Date: Fri, 4 Nov 2005 12:04:53 -0800 From: Linux Kernel Mailing List To: git-commits-head@vger.kernel.org Subject: [NET]: Fix zero-size datagram reception tree ee282f7fd6e465d7b031d64b9ed7c03233ea94cf parent c2da8acaf488b8651edfb04ebf3ab089f3a7830f author Herbert Xu Wed, 02 Nov 2005 18:55:00 +1100 committer Arnaldo Carvalho de Melo Thu, 03 Nov 2005 02:25:04 -0200 [NET]: Fix zero-size datagram reception 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: Arnaldo Carvalho de Melo net/core/datagram.c | 4 ++++ 1 files changed, 4 insertions(+) diff --git a/net/core/datagram.c b/net/core/datagram.c index 81987df..d219435 100644 Index: linux-2.6.14-ck4/net/core/datagram.c =================================================================== --- linux-2.6.14-ck4.orig/net/core/datagram.c 2005-11-09 20:58:02.000000000 +1100 +++ linux-2.6.14-ck4/net/core/datagram.c 2005-11-09 20:58:29.000000000 +1100 @@ -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;