From: Konstantin Khlebnikov <khlebnikov@openvz.org>
To: Oliver Neukum <oneukum@suse.de>
Cc: Michael Riesch <michael@riesch.at>,
Alexey Orishko <alexey.orishko@gmail.com>,
netdev@vger.kernel.org,
Richard Cochran <richardcochran@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
devel@openvz.org
Subject: [PATCH v2] usbnet: fix oops in usbnet_start_xmit
Date: Mon, 07 Nov 2011 18:54:58 +0300 [thread overview]
Message-ID: <20111107145458.29997.79829.stgit@zurg> (raw)
In-Reply-To: <20111106183337.5379.4356.stgit@zurg>
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 <khlebnikov@openvz.org>
---
drivers/net/usb/usbnet.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
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
next prev parent reply other threads:[~2011-11-07 14:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-06 19:33 [PATCH] usbnet: fix oops in usbnet_start_xmit Konstantin Khlebnikov
2011-11-07 13:29 ` Michael Riesch
2011-11-07 13:33 ` Richard Cochran
2011-11-07 14:05 ` Konstantin Khlebnikov
2011-11-07 14:42 ` Richard Cochran
2011-11-07 15:54 ` Konstantin Khlebnikov [this message]
2011-11-07 17:39 ` [PATCH v2] " Richard Cochran
2011-11-07 18:26 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111107145458.29997.79829.stgit@zurg \
--to=khlebnikov@openvz.org \
--cc=alexey.orishko@gmail.com \
--cc=davem@davemloft.net \
--cc=devel@openvz.org \
--cc=michael@riesch.at \
--cc=netdev@vger.kernel.org \
--cc=oneukum@suse.de \
--cc=richardcochran@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).