From patchwork Tue Mar 10 09:16:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fan Du X-Patchwork-Id: 448447 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 BB4CB140172 for ; Tue, 10 Mar 2015 20:21:54 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752686AbbCJJVv (ORCPT ); Tue, 10 Mar 2015 05:21:51 -0400 Received: from mga09.intel.com ([134.134.136.24]:20529 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752596AbbCJJV1 (ORCPT ); Tue, 10 Mar 2015 05:21:27 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP; 10 Mar 2015 02:19:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,373,1422950400"; d="scan'208";a="677763757" Received: from dufan-optiplex-9010.bj.intel.com ([10.238.155.116]) by fmsmga001.fm.intel.com with ESMTP; 10 Mar 2015 02:21:27 -0700 From: Fan Du To: johnwheffner@gmail.com Cc: davem@davemloft.net, netdev@vger.kernel.org, fengyuleidian0615@gmail.com Subject: [PATCH net-next 2/4] ipv4: Correct two conditions checking when buildig nskb Date: Tue, 10 Mar 2015 17:16:24 +0800 Message-Id: <1425978986-8512-3-git-send-email-fan.du@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1425978986-8512-1-git-send-email-fan.du@intel.com> References: <1425978986-8512-1-git-send-email-fan.du@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When traversing write queue to build 'nskb', the size of 'copy' could only be equal or smaller than skb->len. And as we need exactly 'probe_size' bytes data for 'nskb', thus break condition could only be len == probe_size. Signed-off-by: Fan Du --- net/ipv4/tcp_output.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 5a73ad5..79977d1 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -1954,7 +1954,7 @@ static int tcp_mtu_probe(struct sock *sk) skb_put(nskb, copy), copy, nskb->csum); - if (skb->len <= copy) { + if (skb->len == copy) { /* We've eaten all the data from this skb. * Throw it away. */ TCP_SKB_CB(nskb)->tcp_flags |= TCP_SKB_CB(skb)->tcp_flags; @@ -1977,7 +1977,7 @@ static int tcp_mtu_probe(struct sock *sk) len += copy; - if (len >= probe_size) + if (len == probe_size) break; } tcp_init_tso_segs(sk, nskb, nskb->len);