netdev - Re: [PATCH net] 8139too:fix system hang when there is a tx timeout event.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Sat, 30 Jul 2016 20:37:57 -0700 (PDT)
From:	David Miller <davem@...emloft.net>
To:	hau@...ltek.com
Cc:	netdev@...r.kernel.org, nic_swsd@...ltek.com,
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH net] 8139too:fix system hang when there is a tx timeout
 event.

From: Chunhao Lin <hau@...ltek.com>
Date: Thu, 28 Jul 2016 02:39:57 +0800

> If tx timeout event occur, kernel will call rtl8139_tx_timeout_task() to reset
> hardware. But in this function, driver does not stop tx and rx function before
> reset hardware, that will cause system hang.
> 
> In this patch, add stop tx and rx function before reset hardware.
> 
> Signed-off-by: Chunhao Lin <hau@...ltek.com>

First, please always place a space after the subsystem prefix in your Subject
lines "8139too: ".

> @@ -1667,6 +1667,10 @@ static void rtl8139_tx_timeout_task (struct work_struct *work)
>  	int i;
>  	u8 tmp8;
>  
> +	napi_disable(&tp->napi);
> +	netif_stop_queue(dev);
> +	synchronize_sched();
> +
>  	netdev_dbg(dev, "Transmit timeout, status %02x %04x %04x media %02x\n",
>  		   RTL_R8(ChipCmd), RTL_R16(IntrStatus),
>  		   RTL_R16(IntrMask), RTL_R8(MediaStatus));
> @@ -1696,10 +1700,10 @@ static void rtl8139_tx_timeout_task (struct work_struct *work)
>  	spin_unlock_irq(&tp->lock);
>  
>  	/* ...and finally, reset everything */
> -	if (netif_running(dev)) {
> -		rtl8139_hw_start (dev);
> -		netif_wake_queue (dev);
> -	}
> +	napi_enable(&tp->napi);
> +	rtl8139_hw_start (dev);
> +	netif_wake_queue (dev);
> +

Get rid of these spaces in these function calls before the openning parenthesis.