Skip to contentSkip to conversation

TTY/serial fixes for .37-rc6

PATCH New Greg KH 1 participant 3 messages Dec 21, 2010 TTY layer and serial drivers

lore
Share & tools
lore

Greg KH

author
#0 lore raw

PATCH 1/1 TTY/serial fixes for .37-rc6

Here are two tty fixes for your .37-rc6 tree.

Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/tty-2.6.git/ tty-linus

Both of these have been in the -next and -mm releases for a while.

Patches will be sent to the linux-kernel mailing list, if anyone wants to see them.

thanks,

greg k-h

------------

 drivers/tty/n_gsm.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

---------------

Ken Mills (2):
n_gsm: Fix message length handling when building header
n_gsm: gsm_data_alloc buffer allocation could fail and it is not being checked

#1 lore raw

PATCH 1/2 n_gsm: Fix message length handling when building header

From: Ken Mills <[email protected]>

Fix message length handling when building header

When the message length is greater than 127, the length field in the header is built incorrectly. According to the spec, when the length is less than 128 the length field is a single byte formatted as: bbbbbbb1. When it is greater than 127 then the field is two bytes of the format: bbbbbbb0 bbbbbbbb.

---
 drivers/tty/n_gsm.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/tty/n_gsm.c +2 -2
index 81b4658..2fc5cf2 100644
@@ -716,8 +716,8 @@ static void __gsm_data_queue(struct gsm_dlci *dlci, struct gsm_msg *msg)
 		if (msg->len < 128)
 			*--dp = (msg->len << 1) | EA;
 		else {
-			*--dp = ((msg->len & 127) << 1) | EA;
-			*--dp = (msg->len >> 6) & 0xfe;
+			*--dp = (msg->len >> 7);	/* bits 7 - 15 */
+			*--dp = (msg->len & 127) << 1;	/* bits 0 - 6 */
 		}
 	}
 
Signature · 1 line
1.7.3.2
#2 lore raw

PATCH 2/2 n_gsm: gsm_data_alloc buffer allocation could fail and it is not being checked

In reply to Greg KH

From: Ken Mills <[email protected]>

gsm_data_alloc buffer allocation could fail and it is not being checked.

Add check for allocated buffer and return if the buffer allocation fails.

---
 drivers/tty/n_gsm.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/tty/n_gsm.c +2 -0
index 2fc5cf2..c5f8e5b 100644
@@ -968,6 +968,8 @@ static void gsm_control_reply(struct gsm_mux *gsm, int cmd, u8 *data,
 {
 	struct gsm_msg *msg;
 	msg = gsm_data_alloc(gsm, 0, dlen + 2, gsm->ftype);
+	if (msg == NULL)
+		return;
 	msg->data[0] = (cmd & 0xFE) << 1 | EA;	/* Clear C/R */
 	msg->data[1] = (dlen << 1) | EA;
 	memcpy(msg->data + 2, data, dlen);
Signature · 1 line
1.7.3.2