Skip to contentSkip to conversation

mISDN: Fix handling of receive buffer size in L1oIP

PATCH Applied Karsten Keil 2 participants 4 messages Jul 28, 2009 – Aug 2, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover mISDN: Fix handling of receive buffer size in L1oIP

This patch fix a regression introduced in 2.6.31 with the commit 8c90e11e3543d7de612194a042a148caeaab5f1d "mISDN: Use kernel_{send,recv}msg instead of open coding".

Linus: you can pull the fix from
git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6-net-next for_linus

David for net-next-2.6 you can get it from:
git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6-net-next for_david

Andreas Eversberg (1):
mISDN: Fix handling of receive buffer size in L1oIP

 drivers/isdn/mISDN/l1oip_core.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
#1 lore raw

PATCH 1/1 mISDN: Fix handling of receive buffer size in L1oIP

From: Andreas Eversberg <[email protected]>

The size of receive buffer pointer was used to get size of receive buffer instead of recvbuf_size itself, so only 4/8 bytes could be transfered.

This is a regression to 2.6.30 introduced by commit 8c90e11e3543d7de612194a042a148caeaab5f1d
mISDN: Use kernel_{send,recv}msg instead of open coding

---
 drivers/isdn/mISDN/l1oip_core.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/isdn/mISDN/l1oip_core.c +2 -2
index 990e6a7..c3b661a 100644
@@ -731,10 +731,10 @@ l1oip_socket_thread(void *data)
 	while (!signal_pending(current)) {
 		struct kvec iov = {
 			.iov_base = recvbuf,
-			.iov_len = sizeof(recvbuf),
+			.iov_len = recvbuf_size,
 		};
 		recvlen = kernel_recvmsg(socket, &msg, &iov, 1,
-					 sizeof(recvbuf), 0);
+					 recvbuf_size, 0);
 		if (recvlen > 0) {
 			l1oip_socket_parse(hc, &sin_rx, recvbuf, recvlen);
 		} else {
Signature · 1 line
1.6.0.2
maintainer Applied
#2 lore raw

From: Karsten Keil <[email protected]>
Date: Mon, 27 Jul 2009 19:24:04 +0200

Quoted 11 lines

From: Andreas Eversberg <[email protected]>

The size of receive buffer pointer was used to get size of receive buffer instead of recvbuf_size itself, so only 4/8 bytes could be transfered.

This is a regression to 2.6.30 introduced by commit 8c90e11e3543d7de612194a042a148caeaab5f1d
mISDN: Use kernel_{send,recv}msg instead of open coding

Applied to net-2.6, thanks.

maintainer
#3 lore raw
In reply to Karsten Keil

From: Karsten Keil <[email protected]>
Date: Tue, 28 Jul 2009 13:37:01 +0200

Quoted 8 lines

This patch fix a regression introduced in 2.6.31 with the commit 8c90e11e3543d7de612194a042a148caeaab5f1d "mISDN: Use kernel_{send,recv}msg instead of open coding".

Linus: you can pull the fix from
git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6-net-next for_linus

David for net-next-2.6 you can get it from:
git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6-net-next for_david

Karsten, please don't send fix incusion requests like this. Either send them via me always, or bypass me and go straight to Linus always.

Asking two people to pull the fix in via two different means only will make for confusion.

If it's a fix, get it into net-2.6 via me, otherwise submit it to net-next-2.6 if it is not an important fix. Sending it to Linus and my net-next-2.6 at the same time makes %100 no sense. One tree is for fixes, and the other is for new development.

If you're worried about fixes propagating and merging properly, I take care of that completely. When a fix gets into net-2.6 eventually I will merge net-2.6 into net-next-2.6 and that's how it will show up there. If there is a dependency on new work that this fix creates, tell me, and I'll do the merge more quickly for you.