Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

isdn/gigaset: correct bas_gigaset rx buffer handling

Browse source 
In transparent data reception, avoid a NULL pointer dereference
in case an skbuff cannot be allocated, remove an inappropriate
call to the HDLC flush routine, and correct the accounting of
received bytes for continued buffers.

Signed-off-by: Tilman Schmidt <tilman@imap.cc>
CC: stable <stable@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tilman Schmidt 2010-09-30 13:34:51 +00:00 committed by David S. Miller
parent c8701a08d6
commit f3d531b99f
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/isdn/gigaset/isocdata.c
View file

@ -842,13 +842,14 @@ static inline void trans_receive(unsigned char *src, unsigned count,
if (unlikely(bcs->ignore)) { if (unlikely(bcs->ignore)) {
bcs->ignore--; bcs->ignore--;
hdlc_flush(bcs);
return; return;
} }
skb = bcs->rx_skb; skb = bcs->rx_skb;
if (skb == NULL) if (skb == NULL) {
skb = gigaset_new_rx_skb(bcs); skb = gigaset_new_rx_skb(bcs);
bcs->hw.bas->goodbytes += skb->len; if (skb == NULL)
return;
}
dobytes = bcs->rx_bufsize - skb->len; dobytes = bcs->rx_bufsize - skb->len;
while (count > 0) { while (count > 0) {
dst = skb_put(skb, count < dobytes ? count : dobytes); dst = skb_put(skb, count < dobytes ? count : dobytes);
@ -860,6 +861,7 @@ static inline void trans_receive(unsigned char *src, unsigned count,
if (dobytes == 0) { if (dobytes == 0) {
dump_bytes(DEBUG_STREAM_DUMP, dump_bytes(DEBUG_STREAM_DUMP,
"rcv data", skb->data, skb->len); "rcv data", skb->data, skb->len);
bcs->hw.bas->goodbytes += skb->len;
gigaset_skb_rcvd(bcs, skb); gigaset_skb_rcvd(bcs, skb);
skb = gigaset_new_rx_skb(bcs); skb = gigaset_new_rx_skb(bcs);
if (skb == NULL) if (skb == NULL)