Revision: 7553
http://sourceforge.net/p/ipcop/svn/7553
Author: owes
Date: 2014-05-18 14:10:19 +0000 (Sun, 18 May 2014)
Log Message:
-----------
Update linux kernel to 3.4.91
Modified Paths:
--------------
ipcop/trunk/lfs/linux
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
ipcop/trunk/updates/2.1.6/information.xml
Removed Paths:
-------------
ipcop/trunk/src/patches/linux-3.4_fix-n_tty_write-crash.patch
Modified: ipcop/trunk/lfs/linux
===================================================================
--- ipcop/trunk/lfs/linux 2014-05-18 10:48:22 UTC (rev 7552)
+++ ipcop/trunk/lfs/linux 2014-05-18 14:10:19 UTC (rev 7553)
@@ -34,7 +34,7 @@
PKG_NAME = linux
VER = 3.4
-PATCHLEVEL = 3.4.90
+PATCHLEVEL = 3.4.91
IPCOPKRELEASE = -3
HOST_ARCH = all
OTHER_SRC = yes
@@ -72,7 +72,7 @@
$(GRSECURITYPATCH) =
http://ipcop-addons.mooo.com/misc/IPCop/$(GRSECURITYPATCH)
$(DL_FILE)_MD5 = 967f72983655e2479f951195953e8480
-patch-$(PATCHLEVEL).xz_MD5 = d9160b053d17f3384e5479715b4fb6e6
+patch-$(PATCHLEVEL).xz_MD5 = 92a2ff4ae4abc9545a3370e704d85ffc
$(GRSECURITYPATCH)_MD5 = b15bb91a07aa2fb030e18c47c91940bb
install : $(TARGET)
@@ -111,9 +111,6 @@
cd $(DIR_APP) && sed -i -e "s/SUBLEVEL\ =.*//" Makefile
cd $(DIR_APP) && sed -i -e "s/EXTRAVERSION\ =.*/EXTRAVERSION\
=$(IPCOPKRELEASE)/" Makefile
- # not yet in stable release, queued for 3.4.91
- cd $(DIR_APP) && patch -Np1 -i
$(DIR_PATCHES)/$(THISAPP)_fix-n_tty_write-crash.patch
-
# get working isapnp, not yet ready, need some others changes to
retrieve the events
#cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)_isapnp1.patch
#cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)_isapnp2.patch
Deleted: ipcop/trunk/src/patches/linux-3.4_fix-n_tty_write-crash.patch
===================================================================
--- ipcop/trunk/src/patches/linux-3.4_fix-n_tty_write-crash.patch
2014-05-18 10:48:22 UTC (rev 7552)
+++ ipcop/trunk/src/patches/linux-3.4_fix-n_tty_write-crash.patch
2014-05-18 14:10:19 UTC (rev 7553)
@@ -1,77 +0,0 @@
-From: Peter Hurley <pe...@hurleysoftware.com>
-Date: Sat, 3 May 2014 14:04:59 +0200
-Subject: n_tty: Fix n_tty_write crash when echoing in raw mode
-
-commit 4291086b1f081b869c6d79e5b7441633dc3ace00 upstream.
-
-The tty atomic_write_lock does not provide an exclusion guarantee for
-the tty driver if the termios settings are LECHO & !OPOST. And since
-it is unexpected and not allowed to call TTY buffer helpers like
-tty_insert_flip_string concurrently, this may lead to crashes when
-concurrect writers call pty_write. In that case the following two
-writers:
-* the ECHOing from a workqueue and
-* pty_write from the process
-race and can overflow the corresponding TTY buffer like follows.
-
-If we look into tty_insert_flip_string_fixed_flag, there is:
- int space = __tty_buffer_request_room(port, goal, flags);
- struct tty_buffer *tb = port->buf.tail;
- ...
- memcpy(char_buf_ptr(tb, tb->used), chars, space);
- ...
- tb->used += space;
-
-so the race of the two can result in something like this:
- A B
-__tty_buffer_request_room
- __tty_buffer_request_room
-memcpy(buf(tb->used), ...)
-tb->used += space;
- memcpy(buf(tb->used), ...) ->BOOM
-
-B's memcpy is past the tty_buffer due to the previous A's tb->used
-increment.
-
-Since the N_TTY line discipline input processing can output
-concurrently with a tty write, obtain the N_TTY ldisc output_lock to
-serialize echo output with normal tty writes. This ensures the tty
-buffer helper tty_insert_flip_string is not called concurrently and
-everything is fine.
-
-Note that this is nicely reproducible by an ordinary user using
-forkpty and some setup around that (raw termios + ECHO). And it is
-present in kernels at least after commit
-d945cb9cce20ac7143c2de8d88b187f62db99bdc (pty: Rework the pty layer to
-use the normal buffering logic) in 2.6.31-rc3.
-
-js: add more info to the commit log
-js: switch to bool
-js: lock unconditionally
-js: lock only the tty->ops->write call
-
-References: CVE-2014-0196
-Reported-and-tested-by: Jiri Slaby <jsl...@suse.cz>
-Signed-off-by: Peter Hurley <pe...@hurleysoftware.com>
-Signed-off-by: Jiri Slaby <jsl...@suse.cz>
-Cc: Linus Torvalds <torva...@linux-foundation.org>
-Cc: Alan Cox <a...@lxorguk.ukuu.org.uk>
-Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
-[bwh: Backported to 3.2: output_lock is a member of struct tty_struct]
-Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
----
- drivers/tty/n_tty.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/tty/n_tty.c
-+++ b/drivers/tty/n_tty.c
-@@ -1996,7 +1996,9 @@ static ssize_t n_tty_write(struct tty_st
- tty->ops->flush_chars(tty);
- } else {
- while (nr > 0) {
-+ mutex_lock(&tty->output_lock);
- c = tty->ops->write(tty, b, nr);
-+ mutex_unlock(&tty->output_lock);
- if (c < 0) {
- retval = c;
- goto break_out;
Modified: ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
===================================================================
--- ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-05-18 10:48:22 UTC
(rev 7552)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-05-18 14:10:19 UTC
(rev 7553)
@@ -58,7 +58,7 @@
/usr/bin/fcrontab
/usr/sbin/fcron
##
-## linux-3.4-3 (3.4.90)
+## linux-3.4-3 (3.4.91)
/boot/vmlinuz
/boot/vmlinuz-3.4-3
/boot/System.map-3.4-3
Modified: ipcop/trunk/updates/2.1.6/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.6/information.xml 2014-05-18 10:48:22 UTC (rev
7552)
+++ ipcop/trunk/updates/2.1.6/information.xml 2014-05-18 14:10:19 UTC (rev
7553)
@@ -6,7 +6,7 @@
<isoimages>yes</isoimages>
<description>Language updates.<br />
Patch openssl for CVE-2010-5298.<br />
- Upgrade linux kernel to 3.4-3 (3.4.90).<br />
+ Upgrade linux kernel to 3.4-3 (3.4.91).<br />
Upgrade dnsmasq to 2.71, fcron to 3.1.3, openvpn to 2.3.4, squid to
3.4.5, syslinux to 6.02.
Upgrade Perl modules IO-Socket-SSL to 1.984, Net-DNS to 0.75,
Net-SSLeay to 1.61.
<br />
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
