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

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

[Karsten Keil]

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(-)

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

[Karsten Keil]

From: Andreas Eversberg <andreas@eversberg.eu>

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

Signed-off-by: Andreas Eversberg <andreas@eversberg.eu>
Signed-off-by: Karsten Keil <keil@b1-systems.de>
---
 drivers/isdn/mISDN/l1oip_core.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c
index 990e6a7..c3b661a 100644
--- a/drivers/isdn/mISDN/l1oip_core.c
+++ b/drivers/isdn/mISDN/l1oip_core.c
@@ -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 {
-- 
1.6.0.2

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

[David Miller]

From: Karsten Keil <keil@b1-systems.de>
Date: Mon, 27 Jul 2009 19:24:04 +0200

> From: Andreas Eversberg <andreas@eversberg.eu>
> 
> 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
> 
> Signed-off-by: Andreas Eversberg <andreas@eversberg.eu>
> Signed-off-by: Karsten Keil <keil@b1-systems.de>

Applied to net-2.6, thanks.

Re: [PATCH 0/1] mISDN: Fix handling of receive buffer size in L1oIP

[David Miller]

From: Karsten Keil <keil@b1-systems.de>
Date: Tue, 28 Jul 2009 13:37:01 +0200

> 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.