From patchwork Tue Apr 17 20:53:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 153321 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 620D5B6FC8 for ; Wed, 18 Apr 2012 06:54:12 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751657Ab2DQUx4 (ORCPT ); Tue, 17 Apr 2012 16:53:56 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:56415 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750851Ab2DQUxz (ORCPT ); Tue, 17 Apr 2012 16:53:55 -0400 Received: by wejx9 with SMTP id x9so4300205wej.19 for ; Tue, 17 Apr 2012 13:53:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; bh=m/ICzr7Lz8x/ZHY9eYeC/efISvl6Fnq5WMUPoTKdCRA=; b=bWQLZONImUEfho8y07qjg1wH/MVUkvLxZ0sqk2BF6jS2OR2C/XahHD+P4kDP3bdvd5 DUu64lsBMT5IZlkQ7GaOiLXzQtnTpB3aiXO/rJbpd3k+fhoDd+Dn6T/VpcZU2zsR9FRz yjqbWAq13P3GJz/hMk6RbwxwQBGQB0C2/MF38L0cp2Mca9I2cp1EkJ5HM/9oXno6+jdo Ec6cYtLHrRuckC9mQcShuvd7vOuU08rDlKEfDYTzUZ7RUdBOAdU1IzE5CIbbYI4gu5Ui BzfVNh8L9KkEKvWcwZEKL0F6h7OEdZe7GiIQqeWcyDAIHUaQZVae9cxl/QeD7SLSxFj2 xJoA== Received: by 10.180.24.7 with SMTP id q7mr10558636wif.11.1334696034377; Tue, 17 Apr 2012 13:53:54 -0700 (PDT) Received: from [172.28.91.115] ([74.125.122.49]) by mx.google.com with ESMTPS id b3sm29450971wib.4.2012.04.17.13.53.52 (version=SSLv3 cipher=OTHER); Tue, 17 Apr 2012 13:53:53 -0700 (PDT) Subject: Re: 3.4.0-rc2: skb_put() -> skb_over_panic From: Eric Dumazet To: David Miller Cc: a.beregalov@gmail.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20120417.164748.432392687904063236.davem@davemloft.net> References: <1334502964.28012.1.camel@edumazet-glaptop> <1334695506.2472.46.camel@edumazet-glaptop> <20120417.164748.432392687904063236.davem@davemloft.net> Date: Tue, 17 Apr 2012 22:53:51 +0200 Message-ID: <1334696031.2472.50.camel@edumazet-glaptop> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Tue, 2012-04-17 at 16:47 -0400, David Miller wrote: > From: Eric Dumazet > Date: Tue, 17 Apr 2012 22:45:06 +0200 > > > Could you check if commit a21d45726acacc963d8baddf74607d9b74e2b723 > > (tcp: avoid order-1 allocations on wifi and tx path) > > was in your tree ? > > I was about to say that I think this is the guilty commit too. > > Good thing I held off the -stable submission of that change > for a bit :-) Fix should be easy I think, but yes you can hold stable submission of course. --- 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/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 376b2cf..7ac6423 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -1096,6 +1096,7 @@ static void __pskb_trim_head(struct sk_buff *skb, int len) eat = min_t(int, len, skb_headlen(skb)); if (eat) { __skb_pull(skb, eat); + skb->avail_size -= eat; len -= eat; if (!len) return;