From: Dietmar Maurer Date: Thu, 21 Aug 2014 06:47:33 +0000 (+0200) Subject: update to kernel-3.10.0-123.6.3.el7.src.rpm X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9514acf035531ff1f82cb9281eb80cb3c1e4c593;p=pve-kernel-3.10.0.git update to kernel-3.10.0-123.6.3.el7.src.rpm --- diff --git a/Makefile b/Makefile index 58d838c..c1e6453 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ RELEASE=3.2 KERNEL_VER=3.10.0 -PKGREL=15 +PKGREL=16 # also include firmware of previous versrion into # the fw package: fwlist-2.6.32-PREV-pve KREL=4 -RHKVER=123.el7 +RHKVER=123.6.3.el7 KERNELSRCRPM=kernel-${KERNEL_VER}-${RHKVER}.src.rpm @@ -70,8 +70,9 @@ all: check_gcc ${DST_DEB} ${FW_DEB} ${HDR_DEB} .PHONY: download download: - rm ${KERNELSRCRPM} - wget http://vault.centos.org/7.0.1406/os/Source/SPackages/${KERNELSRCRPM} + rm -f ${KERNELSRCRPM} + #wget http://vault.centos.org/7.0.1406/os/Source/SPackages/${KERNELSRCRPM} + wget http://vault.centos.org/7.0.1406/updates/Source/SPackages/${KERNELSRCRPM} check_gcc: ifeq ($(CC), cc) @@ -159,7 +160,6 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README #cd ${KERNEL_SRC}; patch -p1 <../add-tiocgdev-ioctl.patch #cd ${KERNEL_SRC}; patch -p1 <../fix-nfs-block-count.patch #cd ${KERNEL_SRC}; patch -p1 <../fix-idr-header-for-drbd-compilation.patch - cd ${KERNEL_SRC}; patch -p1 <../n_tty-Fix-n_tty_write-crash-when-echoing-in-raw-mode.patch cd ${KERNEL_SRC}; patch -p1 <../add-empty-ndo_poll_controller-to-veth.patch cd ${KERNEL_SRC}; patch -p1 <../override_for_missing_acs_capabilities.patch sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/' diff --git a/README b/README index 34ceba7..3e76abb 100644 --- a/README +++ b/README @@ -1,9 +1,9 @@ KERNEL SOURCE: ============== -We use the RHEL7 kernel sources, available from: +We use the CENTOS7/RHEL7 kernel sources, available from: -ftp://ftp.redhat.com/redhat/rhel/ +http://vault.centos.org/ Additional/Updated Modules: @@ -15,11 +15,10 @@ Additional/Updated Modules: - include latest e1000e driver from intel/sourceforge -# this driver does not compile with RHEL7 kernel -#- include latest Broadcom bnx2 drivers -# -# * original file linux-7.8.56.zip contains -# netxtreme2-7.8.56.tar.gz (added to repository) + include latest Broadcom bnx2 drivers: http://driverdownloads.qlogic.com/ + + * original file linux-7.10.14.zip contains + netxtreme2-7.10.14.tar.gz (added to repository) - include latest Adaptec aacraid driver diff --git a/changelog.Debian b/changelog.Debian index 0d1cb65..6fc911b 100644 --- a/changelog.Debian +++ b/changelog.Debian @@ -1,3 +1,12 @@ +pve-kernel-3.10.0 (3.10.0-16) unstable; urgency=low + + * update to kernel-3.10.0-123.6.3.el7.src.rpm + + * remove patch n_tty-Fix-n_tty_write-crash-when-echoing-in-raw-mode.patch + (now upstream) + + -- Proxmox Support Team Thu, 21 Aug 2014 08:46:54 +0200 + pve-kernel-3.10.0 (3.10.0-15) unstable; urgency=low * gpu passthrough: add override_for_missing_acs_capabilities.patch, diff --git a/kernel-3.10.0-123.6.3.el7.src.rpm b/kernel-3.10.0-123.6.3.el7.src.rpm new file mode 100644 index 0000000..4d7e99a Binary files /dev/null and b/kernel-3.10.0-123.6.3.el7.src.rpm differ diff --git a/kernel-3.10.0-123.el7.src.rpm b/kernel-3.10.0-123.el7.src.rpm deleted file mode 100644 index e34d713..0000000 Binary files a/kernel-3.10.0-123.el7.src.rpm and /dev/null differ diff --git a/n_tty-Fix-n_tty_write-crash-when-echoing-in-raw-mode.patch b/n_tty-Fix-n_tty_write-crash-when-echoing-in-raw-mode.patch deleted file mode 100644 index 3d837a8..0000000 --- a/n_tty-Fix-n_tty_write-crash-when-echoing-in-raw-mode.patch +++ /dev/null @@ -1,78 +0,0 @@ -From: Peter Hurley - -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 -Signed-off-by: Peter Hurley -Signed-off-by: Jiri Slaby -Cc: Linus Torvalds -Cc: Alan Cox -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/tty/n_tty.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/tty/n_tty.c -+++ b/drivers/tty/n_tty.c -@@ -2066,8 +2066,12 @@ static ssize_t n_tty_write(struct tty_st - if (tty->ops->flush_chars) - tty->ops->flush_chars(tty); - } else { -+ struct n_tty_data *ldata = tty->disc_data; -+ - while (nr > 0) { -+ mutex_lock(&ldata->output_lock); - c = tty->ops->write(tty, b, nr); -+ mutex_unlock(&ldata->output_lock); - if (c < 0) { - retval = c; - goto break_out; -