From patchwork Mon Nov 7 15:54:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konstantin Khlebnikov X-Patchwork-Id: 124093 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 D53EAB6F7B for ; Tue, 8 Nov 2011 01:55:10 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754691Ab1KGOzE (ORCPT ); Mon, 7 Nov 2011 09:55:04 -0500 Received: from mail-bw0-f46.google.com ([209.85.214.46]:59393 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753971Ab1KGOzC (ORCPT ); Mon, 7 Nov 2011 09:55:02 -0500 Received: by bke11 with SMTP id 11so3653917bke.19 for ; Mon, 07 Nov 2011 06:55:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=/Bv43HlUsIvKkrwbz38AmeAPuXRwUfyiKokQwa/WPMY=; b=P9xe6E5mPYifo9WTZlVIT0So5XuLy2rFdjuF7EdGYWkUXbW/F1yodjpeQ4HGvNkB+T fKhaguZQrZp1ApRJaYSSpY25UqEB+fgBIiVubFj2f8k1CE9vD9vuHkeVQjtYN91X/NiA 3iwR750+tC0TVVwUe/DXS/CH1tukcmVEMIKFg= Received: by 10.204.156.68 with SMTP id v4mr17613188bkw.88.1320677700773; Mon, 07 Nov 2011 06:55:00 -0800 (PST) Received: from localhost (swsoft-msk-nat.sw.ru. [195.214.232.10]) by mx.google.com with ESMTPS id z13sm14453962bkw.8.2011.11.07.06.54.59 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 07 Nov 2011 06:54:59 -0800 (PST) Subject: [PATCH v2] usbnet: fix oops in usbnet_start_xmit To: Oliver Neukum From: Konstantin Khlebnikov Cc: Michael Riesch , Alexey Orishko , netdev@vger.kernel.org, Richard Cochran , "David S. Miller" , devel@openvz.org Date: Mon, 07 Nov 2011 18:54:58 +0300 Message-ID: <20111107145458.29997.79829.stgit@zurg> In-Reply-To: <20111106183337.5379.4356.stgit@zurg> References: <20111106183337.5379.4356.stgit@zurg> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch fixes the bug added in commit v3.1-rc7-1055-gf9b491e SKB can be NULL at this point, at least for cdc-ncm. Signed-off-by: Konstantin Khlebnikov Acked-by: Richard Cochran --- drivers/net/usb/usbnet.c | 3 ++- 1 files changed, 2 insertions(+), 1 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/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 7d60821..fae0fbd 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -1057,7 +1057,8 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb, unsigned long flags; int retval; - skb_tx_timestamp(skb); + if (skb) + skb_tx_timestamp(skb); // some devices want funky USB-level framing, for // win32 driver (usually) and/or hardware quirks