| Date | Sun, 13 Sep 2015 00:56:47 +0200 | From | Willy Tarreau <> | Subject | [PATCH 2.6.32 41/62] staging: vt6655: device_rx_srv check sk_buff is NULL |
| |
2.6.32-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Malcolm Priestley <tvboxspy@gmail.com>
commit b5eeed8cb6097c8ea660b6598d36fdbb94065a22 upstream.
There is a small chance that pRD->pRDInfo->skb could go NULL while the interrupt is processing.
Put NULL check on loop to break out.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> [bwh: Backported to 3.2: adjust context, indentation] Signed-off-by: Ben Hutchings <ben@decadent.org.uk> (cherry picked from commit 35ee488df7402c0549f8329dc20690cf7fe22492)
Signed-off-by: Willy Tarreau <w@1wt.eu> --- drivers/staging/vt6655/device_main.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 269d1e2..1680bed 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1605,6 +1605,10 @@ static int device_rx_srv(PSDevice pDevice, UINT uIdx) { // DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->pCurrRD = %x, works = %d\n", pRD, works); if (works++>15) break; + + if (!pRD->pRDInfo->skb) + break; + if (device_receive_frame(pDevice, pRD)) { if (!device_alloc_rx_buf(pDevice,pRD)) { DBG_PRT(MSG_LEVEL_ERR, KERN_ERR -- 1.7.12.2.21.g234cd45.dirty
|