From patchwork Wed Sep 18 12:03:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Duan Jiong X-Patchwork-Id: 275689 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 F2B302C00F7 for ; Wed, 18 Sep 2013 22:04:33 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752508Ab3IRMEa (ORCPT ); Wed, 18 Sep 2013 08:04:30 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:39067 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752141Ab3IRME3 (ORCPT ); Wed, 18 Sep 2013 08:04:29 -0400 X-IronPort-AV: E=Sophos;i="4.90,929,1371052800"; d="scan'208";a="8562701" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 18 Sep 2013 20:01:17 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r8IC4SXo013518; Wed, 18 Sep 2013 20:04:28 +0800 Received: from [10.167.225.86] ([10.167.225.86]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013091820025693-1608789 ; Wed, 18 Sep 2013 20:02:56 +0800 Message-ID: <5239968F.1070402@cn.fujitsu.com> Date: Wed, 18 Sep 2013 20:03:27 +0800 From: Duan Jiong User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130612 Thunderbird/17.0.6 MIME-Version: 1.0 To: David Miller CC: netdev@vger.kernel.org, hannes@stressinduktion.org Subject: [PATCH ] net:dccp: do not report ICMP redirects to user space X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/09/18 20:02:56, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/09/18 20:02:57, Serialize complete at 2013/09/18 20:02:57 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Duan Jiong DCCP shouldn't be setting sk_err on redirects as it isn't an error condition. it should be doing exactly what tcp is doing and leaving the error handler without touching the socket. Signed-off-by: Duan Jiong --- net/dccp/ipv6.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 9c61f9c..6cf9f77 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c @@ -135,6 +135,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, if (dst) dst->ops->redirect(dst, sk, skb); + goto out; } if (type == ICMPV6_PKT_TOOBIG) {