diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2015-05-31 10:35:28 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-08-12 16:33:13 +0200 |
| commit | 35ee488df7402c0549f8329dc20690cf7fe22492 (patch) | |
| tree | 2b3f2960fc819d0109eaede0269bfb0f10f331b9 /drivers/staging | |
| parent | 23a910129bb1fa840ffd86f3e8a0de2dcf1440e0 (diff) | |
| download | kernel_samsung_smdk4412-35ee488df7402c0549f8329dc20690cf7fe22492.zip kernel_samsung_smdk4412-35ee488df7402c0549f8329dc20690cf7fe22492.tar.gz kernel_samsung_smdk4412-35ee488df7402c0549f8329dc20690cf7fe22492.tar.bz2 | |
staging: vt6655: device_rx_srv check sk_buff is NULL
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/vt6655/device_main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index d540a06..077c506 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1602,6 +1602,10 @@ static int device_rx_srv(PSDevice pDevice, unsigned int 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 |