From: Greg Kroah-Hartman Date: Fri, 21 Sep 2007 21:59:03 +0000 (-0700) Subject: 2 more patches for 2.6.22 X-Git-Tag: v2.6.22.7~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e855a03f50bf4047a40fbf7cc890598835d9e750;p=thirdparty%2Fkernel%2Fstable-queue.git 2 more patches for 2.6.22 --- diff --git a/queue-2.6.22/disable-sys_timerfd.patch b/queue-2.6.22/disable-sys_timerfd.patch new file mode 100644 index 00000000000..bc4e790e2e3 --- /dev/null +++ b/queue-2.6.22/disable-sys_timerfd.patch @@ -0,0 +1,37 @@ +From e42601973b1bce1d2987f82159c1ebeaccc6b310 Mon Sep 17 00:00:00 2001 +From: Andrew Morton +Date: Tue, 18 Sep 2007 22:46:41 -0700 +Subject: disable sys_timerfd() + +From: Andrew Morton + +commit e42601973b1bce1d2987f82159c1ebeaccc6b310 in mainline. + +There is still some confusion and disagreement over what this interface should +actually do. So it is best that we disable it in 2.6.23 until we get that +fully sorted out. + +(sys_timerfd() was present in 2.6.22 but it was apparently broken, so here we +assume that nobody is using it yet). + +Cc: Michael Kerrisk +Cc: Davide Libenzi +Acked-by: Linus Torvalds +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + init/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -505,6 +505,7 @@ config SIGNALFD + config TIMERFD + bool "Enable timerfd() system call" if EMBEDDED + depends on ANON_INODES ++ depends on BROKEN + default y + help + Enable the timerfd() system call that allows to receive timer diff --git a/queue-2.6.22/rpc-fix-garbage-in-printk-in-svc_tcp_accept.patch b/queue-2.6.22/rpc-fix-garbage-in-printk-in-svc_tcp_accept.patch new file mode 100644 index 00000000000..143a4e32689 --- /dev/null +++ b/queue-2.6.22/rpc-fix-garbage-in-printk-in-svc_tcp_accept.patch @@ -0,0 +1,49 @@ +From stable-bounces@linux.kernel.org Thu Sep 20 12:52:31 2007 +From: Wolfgang Walter +Date: Thu, 20 Sep 2007 15:51:46 -0400 +Subject: rpc: fix garbage in printk in svc_tcp_accept() +To: Linus Torvalds +Cc: Trond Myklebust , Neil Brown , linux-kernel@vger.kernel.org, Andrew Morton , stable@kernel.org, Wolfgang Walter +Message-ID: <20070920195146.GC23287@fieldses.org> +Content-Disposition: inline + +From: Wolfgang Walter + +commit 9db619e66503494e41159de3c76fafabe80d016b in mainline. + +we upgraded the kernel of a nfs-server from 2.6.17.11 to 2.6.22.6. Since +then we get the message + +lockd: too many open TCP sockets, consider increasing the number of nfsd threads +lockd: last TCP connect from ^\\236^\É^D + +These random characters in the second line are caused by a bug in +svc_tcp_accept. + +(Note: there are two previous __svc_print_addr(sin, buf, sizeof(buf)) +calls in this function, either of which would initialize buf correctly; +but both are inside "if"'s and are not necessarily executed. This is +less obvious in the second case, which is inside a dprintk(), which is a +macro which expands to an if statement.) + +Signed-off-by: Wolfgang Walter +Signed-off-by: J. Bruce Fields +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + net/sunrpc/svcsock.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/net/sunrpc/svcsock.c ++++ b/net/sunrpc/svcsock.c +@@ -1090,7 +1090,8 @@ svc_tcp_accept(struct svc_sock *svsk) + serv->sv_name); + printk(KERN_NOTICE + "%s: last TCP connect from %s\n", +- serv->sv_name, buf); ++ serv->sv_name, __svc_print_addr(sin, ++ buf, sizeof(buf))); + } + /* + * Always select the oldest socket. It's not fair, diff --git a/queue-2.6.22/series b/queue-2.6.22/series index 6ea9c567174..c7fcafbb5f3 100644 --- a/queue-2.6.22/series +++ b/queue-2.6.22/series @@ -16,3 +16,5 @@ v4l-cx88-avoid-a-null-pointer-dereference-during-mpeg_open.patch hwmon-end-of-i-o-region-off-by-one.patch fix-debug-regression-in-video-pwc.patch splice-fix-direct-splice-error-handling.patch +rpc-fix-garbage-in-printk-in-svc_tcp_accept.patch +disable-sys_timerfd.patch