From patchwork Mon Jan 30 14:29:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 138583 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D5471B6EF2 for ; Tue, 31 Jan 2012 01:29:38 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753344Ab2A3O33 (ORCPT ); Mon, 30 Jan 2012 09:29:29 -0500 Received: from mail-bk0-f46.google.com ([209.85.214.46]:38027 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753167Ab2A3O32 (ORCPT ); Mon, 30 Jan 2012 09:29:28 -0500 Received: by mail-bk0-f46.google.com with SMTP id s6so3216331bka.19 for ; Mon, 30 Jan 2012 06:29:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=message-id:subject:from:to:cc:date:content-type:x-mailer :content-transfer-encoding:mime-version; bh=TQfNZSSt2oX8xKpfmTUdqJZBko0KyH8GAkcccON4rAE=; b=V+IfIL870oCQ29IeaAR/V7D9SxW5zHeofLhElAns0cDNaSUlPBvbvX9rsAy5aMz524 SKBdLY0fdHL9EkpR1H5sW4hXSJ4P9XjObVndrnZD0v3S6+Zn+yrAMAslO2vRgKAwNQGP /lX5vqNyJeCjoYQeCor6xmkd6sQbHdRca/VG8= Received: by 10.205.137.4 with SMTP id im4mr8913459bkc.136.1327933767484; Mon, 30 Jan 2012 06:29:27 -0800 (PST) Received: from [10.150.51.214] (gw0.net.jmsp.net. [212.23.165.14]) by mx.google.com with ESMTPS id x20sm22705595bka.9.2012.01.30.06.29.25 (version=SSLv3 cipher=OTHER); Mon, 30 Jan 2012 06:29:26 -0800 (PST) Message-ID: <1327933764.2288.42.camel@edumazet-HP-Compaq-6005-Pro-SFF-PC> Subject: [PATCH net-next] ipv6: fix RFC5722 comment From: Eric Dumazet To: David Miller Cc: netdev , Nicolas Dichtel Date: Mon, 30 Jan 2012 15:29:24 +0100 X-Mailer: Evolution 3.2.2- Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org RFC5722 Section 4 was amended by Errata 3089 Our implementation did the right thing anyway... Signed-off-by: Eric Dumazet Cc: Nicolas Dichtel Acked-by: Nicolas Dichtel --- net/ipv6/reassembly.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index b69fae7..9447bd6 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c @@ -336,12 +336,11 @@ static int ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb, } found: - /* RFC5722, Section 4: - * When reassembling an IPv6 datagram, if + /* RFC5722, Section 4, amended by Errata ID : 3089 + * When reassembling an IPv6 datagram, if * one or more its constituent fragments is determined to be an * overlapping fragment, the entire datagram (and any constituent - * fragments, including those not yet received) MUST be silently - * discarded. + * fragments) MUST be silently discarded. */ /* Check for overlap with preceding fragment. */