UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

n_gsm: memory leak in uplink error path 

Uplink (TX) network data will go through gsm_dlci_data_output_framed
there is a bug where if memory allocation fails, the skb which
has already been pulled off the list will be lost.

In addition TX skbs were being processed in LIFO order

Fixed the memory leak, and changed to FIFO order processing

Signed-off-by: Russ Gorby <russ.gorby@intel.com>
Tested-by: Kappel, LaurentX <laurentx.kappel@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Cc: Showjumping <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Russ Gorby 2012-08-13 13:45:30 +01:00 committed by Greg Kroah-Hartman
parent 329e56780e
commit 88ed2a6061
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/tty/n_gsm.c
View File

@ -868,7 +868,7 @@ static int gsm_dlci_data_output_framed(struct gsm_mux *gsm,
/* dlci->skb is locked by tx_lock */ /* dlci->skb is locked by tx_lock */
if (dlci->skb == NULL) { if (dlci->skb == NULL) {
dlci->skb = skb_dequeue(&dlci->skb_list); dlci->skb = skb_dequeue_tail(&dlci->skb_list);
if (dlci->skb == NULL) if (dlci->skb == NULL)
return 0; return 0;
first = 1; first = 1;
@ -892,8 +892,11 @@ static int gsm_dlci_data_output_framed(struct gsm_mux *gsm,
/* FIXME: need a timer or something to kick this so it can't /* FIXME: need a timer or something to kick this so it can't
get stuck with no work outstanding and no buffer free */ get stuck with no work outstanding and no buffer free */
if (msg == NULL) if (msg == NULL) {
skb_queue_tail(&dlci->skb_list, dlci->skb);
dlci->skb = NULL;
return -ENOMEM; return -ENOMEM;
}
dp = msg->data; dp = msg->data;
if (dlci->adaption == 4) { /* Interruptible framed (Packetised Data) */ if (dlci->adaption == 4) { /* Interruptible framed (Packetised Data) */