[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20111107173919.GA2730@netboy.at.omicron.at>
Date: Mon, 7 Nov 2011 18:39:19 +0100
From: Richard Cochran <richardcochran@...il.com>
To: Konstantin Khlebnikov <khlebnikov@...nvz.org>
Cc: Oliver Neukum <oneukum@...e.de>,
Michael Riesch <michael@...sch.at>,
Alexey Orishko <alexey.orishko@...il.com>,
netdev@...r.kernel.org, "David S. Miller" <davem@...emloft.net>,
devel@...nvz.org
Subject: Re: [PATCH v2] usbnet: fix oops in usbnet_start_xmit
On Mon, Nov 07, 2011 at 06:54:58PM +0300, Konstantin Khlebnikov wrote:
> 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@...nvz.org>
Acked-by: Richard Cochran <richardcochran@...il.com>
> ---
> 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
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists