netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tilman Schmidt <tilman@imap.cc>
To: Karsten Keil <isdn@linux-pingi.de>, David Miller <davem@davemloft.net>
Cc: Hansjoerg Lipp <hjlipp@web.de>, Karsten Keil <keil@b1-systems.de>,
	i4ldeveloper@listserv.isdn4linux.de, netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 3/9] isdn/gigaset: correct bas_gigaset rx buffer handling
Date: Fri,  1 Oct 2010 01:34:51 +0200 (CEST)	[thread overview]
Message-ID: <20100930-patch-gigaset-03.tilman@imap.cc> (raw)
In-Reply-To: <20100930-patch-gigaset-00.tilman@imap.cc>

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>
---
 drivers/isdn/gigaset/isocdata.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/isdn/gigaset/isocdata.c b/drivers/isdn/gigaset/isocdata.c
index 2dfd346..f39ccdf 100644
--- a/drivers/isdn/gigaset/isocdata.c
+++ b/drivers/isdn/gigaset/isocdata.c
@@ -842,13 +842,14 @@ static inline void trans_receive(unsigned char *src, unsigned count,
 
 	if (unlikely(bcs->ignore)) {
 		bcs->ignore--;
-		hdlc_flush(bcs);
 		return;
 	}
 	skb = bcs->rx_skb;
-	if (skb == NULL)
+	if (skb == NULL) {
 		skb = gigaset_new_rx_skb(bcs);
-	bcs->hw.bas->goodbytes += skb->len;
+		if (skb == NULL)
+			return;
+	}
 	dobytes = bcs->rx_bufsize - skb->len;
 	while (count > 0) {
 		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) {
 			dump_bytes(DEBUG_STREAM_DUMP,
 				   "rcv data", skb->data, skb->len);
+			bcs->hw.bas->goodbytes += skb->len;
 			gigaset_skb_rcvd(bcs, skb);
 			skb = gigaset_new_rx_skb(bcs);
 			if (skb == NULL)
-- 
1.7.3.15.g442cb

  parent reply	other threads:[~2010-09-30 23:34 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-30 23:34 [PATCH 0/9] Gigaset patches for net-next Tilman Schmidt
2010-09-30 23:34 ` [PATCH 1/9] isdn/gigaset: bas_gigaset locking fix Tilman Schmidt
2010-09-30 23:34 ` [PATCH 2/9] isdn/gigaset: fix bas_gigaset AT read error handling Tilman Schmidt
2010-09-30 23:34 ` Tilman Schmidt [this message]
2010-09-30 23:35 ` [PATCH 4/9] isdn/gigaset: drop obsolete debug option Tilman Schmidt
2010-09-30 23:35 ` [PATCH 5/9] isdn/gigaset: bas_gigaset timer cleanup Tilman Schmidt
2010-09-30 23:35 ` [PATCH 6/9] isdn/gigaset: try USB reset for bas_gigaset error recovery Tilman Schmidt
2010-09-30 23:35 ` [PATCH 7/9] isdn/gigaset: unclog bas_gigaset AT response pipe Tilman Schmidt
2010-09-30 23:35 ` [PATCH 8/9] isdn/gigaset: fix bas_gigaset interrupt read error handling Tilman Schmidt
2010-09-30 23:35 ` [PATCH 9/9] isdn/gigaset: improve bas_gigaset USB error reporting Tilman Schmidt
2010-10-01  7:35 ` [PATCH 0/9] Gigaset patches for net-next David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100930-patch-gigaset-03.tilman@imap.cc \
    --to=tilman@imap.cc \
    --cc=davem@davemloft.net \
    --cc=hjlipp@web.de \
    --cc=i4ldeveloper@listserv.isdn4linux.de \
    --cc=isdn@linux-pingi.de \
    --cc=keil@b1-systems.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).