From: Greg Kroah-Hartman <gregkh@suse.de>
To: linux-serial@vger.kernel.org
Cc: Russ Gorby <russ.gorby@intel.com>, Greg Kroah-Hartman <gregkh@suse.de>
Subject: [PATCH 09/12] tty: n_gsm: improper skb_pull() use was leaking framed data
Date: Tue, 28 Jun 2011 09:03:46 -0700 [thread overview]
Message-ID: <1309277029-1532-9-git-send-email-gregkh@suse.de> (raw)
In-Reply-To: <1309277029-1532-1-git-send-email-gregkh@suse.de>
From: Russ Gorby <russ.gorby@intel.com>
gsm_dlci_data_output_framed() was doing:
memcpy(dp, skb_pull(dlci->skb, len), len);
The problem is skb_pull() returns the post-increment data ptr
so the first chunk of dlci->skb->data is leaked.
Signed-off-by: Russ Gorby <russ.gorby@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/tty/n_gsm.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index 7290394..19b4ae0 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -875,7 +875,8 @@ static int gsm_dlci_data_output_framed(struct gsm_mux *gsm,
*dp++ = last << 7 | first << 6 | 1; /* EA */
len--;
}
- memcpy(dp, skb_pull(dlci->skb, len), len);
+ memcpy(dp, dlci->skb->data, len);
+ skb_pull(dlci->skb, len);
__gsm_data_queue(dlci, msg);
if (last)
dlci->skb = NULL;
--
1.7.5.4
next prev parent reply other threads:[~2011-06-28 16:04 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-28 15:38 [GIT PATCH] TTY/serial driver fixes for 3.0 Greg KH
2011-06-28 16:03 ` [PATCH 01/12] 8250_pci: add -ENODEV code for Intel EG20T PCH Greg Kroah-Hartman
2011-06-28 16:03 ` [PATCH 02/12] serial: ioremap warning fix for jsm driver Greg Kroah-Hartman
2011-06-28 16:03 ` [PATCH 03/12] ARM: SAMSUNG: serial: Fix on handling of one clock source for UART Greg Kroah-Hartman
2011-06-28 16:03 ` [PATCH 04/12] 8250_pci: Fix missing const from merges Greg Kroah-Hartman
2011-06-29 1:36 ` Guenter Roeck
2011-06-29 4:20 ` Greg KH
2011-06-29 14:41 ` Guenter Roeck
2011-06-28 16:03 ` [PATCH 05/12] 8250: Fix capabilities when changing the port type Greg Kroah-Hartman
2011-06-28 16:03 ` [PATCH 06/12] TTY: ldisc, do not close until there are readers Greg Kroah-Hartman
2011-06-28 16:03 ` [PATCH 07/12] TTY: ntty, add one more sanity check Greg Kroah-Hartman
2011-06-28 16:03 ` [PATCH 08/12] tty: n_gsm: Fixed logic to decode break signal from modem status Greg Kroah-Hartman
2011-06-28 16:03 ` Greg Kroah-Hartman [this message]
2011-06-28 16:03 ` [PATCH 10/12] amba pl011: workaround for uart registers lockup Greg Kroah-Hartman
2011-06-28 16:03 ` [PATCH 11/12] amba pl011: platform data for reg lockup and glitch v2 Greg Kroah-Hartman
2011-06-28 16:03 ` [PATCH 12/12] serial: bcm63xx_uart: fix irq storm after rx fifo overrun Greg Kroah-Hartman
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=1309277029-1532-9-git-send-email-gregkh@suse.de \
--to=gregkh@suse.de \
--cc=linux-serial@vger.kernel.org \
--cc=russ.gorby@intel.com \
/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).