From patchwork Mon Dec 17 04:46:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 206770 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 71ED12C007C for ; Mon, 17 Dec 2012 15:46:57 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751491Ab2LQEqe (ORCPT ); Sun, 16 Dec 2012 23:46:34 -0500 Received: from mail-da0-f46.google.com ([209.85.210.46]:60388 "EHLO mail-da0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751266Ab2LQEqd (ORCPT ); Sun, 16 Dec 2012 23:46:33 -0500 Received: by mail-da0-f46.google.com with SMTP id p5so2583962dak.19 for ; Sun, 16 Dec 2012 20:46:32 -0800 (PST) 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=Af8NYsqG6VCekWmgP5Oq5k8WmM28fFwwZ6iOf64OHuU=; b=w7dBEJ56UR5ji7lOaNHhOwd4YpQv7nbn9KIujof/2p/u45ffEApJ2ddaJsaXXMMW6Z QyWIAm1tLyjIlSWWfjxFDlYhK++Y0v4UkHnISkP9cLx8SY0yCUIFuKvkhB2GXOVOfQOV ptFiWWDJYWova1vYDVYvfs/sv2LUdHllCgw3vRZ6keQzqmvDHYKgVqOydIztWZd0oRua 4kuD8gaXX3IGuESKX52ptY/Z813Uxx9gpKOx3jihMlLryioWB2WlvIOZ/4sYVqwsNmc2 y5d26rLMFWw+Qb1oyHETGtPJetuhdugGvQAVMhbMFVTzOz/DZJ8XbloIVllp5/Lnz6ic Aw1w== Received: by 10.66.80.68 with SMTP id p4mr39070592pax.35.1355719592226; Sun, 16 Dec 2012 20:46:32 -0800 (PST) Received: from [172.26.55.26] ([172.26.55.26]) by mx.google.com with ESMTPS id ue7sm7465463pbc.53.2012.12.16.20.46.29 (version=SSLv3 cipher=OTHER); Sun, 16 Dec 2012 20:46:30 -0800 (PST) Subject: Re: openconnect triggers soft lockup in __skb_get_rxhash From: Eric Dumazet To: "Kirill A. Shutemov" Cc: David Miller , maxk@qti.qualcomm.com, netdev@vger.kernel.org, dwmw2@infradead.org In-Reply-To: <20121217014631.GA23101@shutemov.name> References: <20121217005616.GA23029@shutemov.name> <20121216.172214.687979484434537200.davem@davemloft.net> <20121217014631.GA23101@shutemov.name> Date: Sun, 16 Dec 2012 20:46:29 -0800 Message-ID: <1355719589.10504.13.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 Mon, 2012-12-17 at 03:46 +0200, Kirill A. Shutemov wrote: > On Sun, Dec 16, 2012 at 05:22:14PM -0800, David Miller wrote: > > > > Already fixed in Linus's tree by: > > > > From 499744209b2cbca66c42119226e5470da3bb7040 Mon Sep 17 00:00:00 2001 > > No, it's not. I use up-to-date (2a74dbb) Linus tree with the patch in and > still see the issue. > Coud you try the following one liner ? Tested-by: Daniel Borkmann --- 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/drivers/net/tun.c b/drivers/net/tun.c index 255a9f5..173acf5 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1199,6 +1199,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, skb_shinfo(skb)->tx_flags |= SKBTX_DEV_ZEROCOPY; } + skb_reset_network_header(skb); rxhash = skb_get_rxhash(skb); netif_rx_ni(skb);