diff -Nru linux-ti-omap4-3.2.0/debian/changelog linux-ti-omap4-3.2.0/debian/changelog --- linux-ti-omap4-3.2.0/debian/changelog 2016-11-30 10:55:25.000000000 +0000 +++ linux-ti-omap4-3.2.0/debian/changelog 2016-12-05 11:45:03.000000000 +0000 @@ -1,20 +1,11 @@ -linux-ti-omap4 (3.2.0-1495.122) precise; urgency=low +linux-ti-omap4 (3.2.0-1496.123) precise; urgency=low - [ Luis Henriques ] + [ Ubuntu: 3.2.0-118.161 ] - * Release Tracking Bug - - LP: #1646056 + * CVE-2016-8655 (LP: #1646318) + - packet: fix race condition in packet_set_ring - [ Ubuntu: 3.2.0-117.159 ] - - * Release Tracking Bug - - LP: #1646055 - * CVE-2016-7916 - - proc: prevent accessing /proc//environ until it's ready - * [Hyper-V] do not lose pending heartbeat vmbus packets (LP: #1632786) - - hv: do not lose pending heartbeat vmbus packets - - -- Luis Henriques Wed, 30 Nov 2016 10:40:35 +0000 + -- Luis Henriques Mon, 05 Dec 2016 11:30:37 +0000 linux-ti-omap4 (3.2.0-1494.121) precise; urgency=low diff -Nru linux-ti-omap4-3.2.0/debian/control linux-ti-omap4-3.2.0/debian/control --- linux-ti-omap4-3.2.0/debian/control 2016-11-30 10:55:25.000000000 +0000 +++ linux-ti-omap4-3.2.0/debian/control 2016-12-05 11:45:03.000000000 +0000 @@ -55,7 +55,7 @@ # This package provides the architecture independent parts for kernel # version locked tools in the 3.2.0 kernel source. -Package: linux-headers-3.2.0-1495 +Package: linux-headers-3.2.0-1496 Architecture: armel armhf Section: devel Priority: optional @@ -64,7 +64,7 @@ Description: Header files related to Linux kernel version 3.2.0 This package provides kernel header files for version 3.2.0, for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.2.0-1495/debian.README.gz for details + /usr/share/doc/linux-headers-3.2.0-1496/debian.README.gz for details #Package: linux-libc-dev #Architecture: armel armhf @@ -78,18 +78,18 @@ # libraries. They are NOT meant to be used to build third-party modules for # your kernel. Use linux-ti-omap4-headers-* packages for that. -Package: linux-ti-omap4-tools-3.2.0-1495 +Package: linux-ti-omap4-tools-3.2.0-1496 Architecture: armel armhf Section: devel Priority: optional Depends: ${misc:Depends}, ${shlibs:Depends}, linux-tools-common -Description: Linux kernel tools for version 3.2.0-1495 +Description: Linux kernel tools for version 3.2.0-1496 This package provides the architecture dependant parts for kernel - version locked tools for version 3.2.0-1495 on + version locked tools for version 3.2.0-1496 on DESC. -Package: linux-image-3.2.0-1495-omap4 +Package: linux-image-3.2.0-1496-omap4 Architecture: armel armhf Section: kernel Priority: optional @@ -115,20 +115,20 @@ the linux-omap4 meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.2.0-1495-omap4 +Package: linux-headers-3.2.0-1496-omap4 Architecture: armel armhf Section: devel Priority: optional -Depends: ${misc:Depends}, coreutils | fileutils (>= 4.0), linux-headers-3.2.0-1495, ${shlibs:Depends} +Depends: ${misc:Depends}, coreutils | fileutils (>= 4.0), linux-headers-3.2.0-1496, ${shlibs:Depends} Provides: linux-ti-omap4-headers, linux-ti-omap4-headers-2.6 Description: Linux kernel headers for version 3.2.0 on TI OMAP4-based systems This package provides kernel header files for version 3.2.0 on TI OMAP4-based systems. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-ti-omap4-headers-3.2.0-1495/debian.README.gz for details. + /usr/share/doc/linux-ti-omap4-headers-3.2.0-1496/debian.README.gz for details. -Package: linux-image-3.2.0-1495-omap4-dbgsym +Package: linux-image-3.2.0-1496-omap4-dbgsym Architecture: armel armhf Section: devel Priority: optional diff -Nru linux-ti-omap4-3.2.0/debian.master/changelog linux-ti-omap4-3.2.0/debian.master/changelog --- linux-ti-omap4-3.2.0/debian.master/changelog 2016-11-30 10:40:56.000000000 +0000 +++ linux-ti-omap4-3.2.0/debian.master/changelog 2016-12-05 11:24:26.000000000 +0000 @@ -1,17 +1,9 @@ -linux (3.2.0-117.159) precise; urgency=low +linux (3.2.0-118.161) precise; urgency=low - [ Luis Henriques ] + * CVE-2016-8655 (LP: #1646318) + - packet: fix race condition in packet_set_ring - * Release Tracking Bug - - LP: #1646055 - - * CVE-2016-7916 - - proc: prevent accessing /proc//environ until it's ready - - * [Hyper-V] do not lose pending heartbeat vmbus packets (LP: #1632786) - - hv: do not lose pending heartbeat vmbus packets - - -- Luis Henriques Wed, 30 Nov 2016 10:01:48 +0000 + -- Brad Figg Thu, 01 Dec 2016 16:19:55 -0800 linux (3.2.0-116.158) precise; urgency=low diff -Nru linux-ti-omap4-3.2.0/debian.ti-omap4/changelog linux-ti-omap4-3.2.0/debian.ti-omap4/changelog --- linux-ti-omap4-3.2.0/debian.ti-omap4/changelog 2016-11-30 10:46:34.000000000 +0000 +++ linux-ti-omap4-3.2.0/debian.ti-omap4/changelog 2016-12-05 11:30:38.000000000 +0000 @@ -1,20 +1,11 @@ -linux-ti-omap4 (3.2.0-1495.122) precise; urgency=low +linux-ti-omap4 (3.2.0-1496.123) precise; urgency=low - [ Luis Henriques ] + [ Ubuntu: 3.2.0-118.161 ] - * Release Tracking Bug - - LP: #1646056 + * CVE-2016-8655 (LP: #1646318) + - packet: fix race condition in packet_set_ring - [ Ubuntu: 3.2.0-117.159 ] - - * Release Tracking Bug - - LP: #1646055 - * CVE-2016-7916 - - proc: prevent accessing /proc//environ until it's ready - * [Hyper-V] do not lose pending heartbeat vmbus packets (LP: #1632786) - - hv: do not lose pending heartbeat vmbus packets - - -- Luis Henriques Wed, 30 Nov 2016 10:40:35 +0000 + -- Luis Henriques Mon, 05 Dec 2016 11:30:37 +0000 linux-ti-omap4 (3.2.0-1494.121) precise; urgency=low diff -Nru linux-ti-omap4-3.2.0/debian.ti-omap4/control.stub linux-ti-omap4-3.2.0/debian.ti-omap4/control.stub --- linux-ti-omap4-3.2.0/debian.ti-omap4/control.stub 2016-11-30 10:55:24.000000000 +0000 +++ linux-ti-omap4-3.2.0/debian.ti-omap4/control.stub 2016-12-05 11:45:02.000000000 +0000 @@ -55,7 +55,7 @@ # This package provides the architecture independent parts for kernel # version locked tools in the 3.2.0 kernel source. -Package: linux-headers-3.2.0-1495 +Package: linux-headers-3.2.0-1496 Architecture: armel armhf Section: devel Priority: optional @@ -64,7 +64,7 @@ Description: Header files related to Linux kernel version 3.2.0 This package provides kernel header files for version 3.2.0, for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-3.2.0-1495/debian.README.gz for details + /usr/share/doc/linux-headers-3.2.0-1496/debian.README.gz for details #Package: linux-libc-dev #Architecture: armel armhf @@ -78,18 +78,18 @@ # libraries. They are NOT meant to be used to build third-party modules for # your kernel. Use linux-ti-omap4-headers-* packages for that. -Package: linux-ti-omap4-tools-3.2.0-1495 +Package: linux-ti-omap4-tools-3.2.0-1496 Architecture: armel armhf Section: devel Priority: optional Depends: ${misc:Depends}, ${shlibs:Depends}, linux-tools-common -Description: Linux kernel tools for version 3.2.0-1495 +Description: Linux kernel tools for version 3.2.0-1496 This package provides the architecture dependant parts for kernel - version locked tools for version 3.2.0-1495 on + version locked tools for version 3.2.0-1496 on DESC. -Package: linux-image-3.2.0-1495-omap4 +Package: linux-image-3.2.0-1496-omap4 Architecture: armel armhf Section: kernel Priority: optional @@ -115,20 +115,20 @@ the linux-omap4 meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-3.2.0-1495-omap4 +Package: linux-headers-3.2.0-1496-omap4 Architecture: armel armhf Section: devel Priority: optional -Depends: ${misc:Depends}, coreutils | fileutils (>= 4.0), linux-headers-3.2.0-1495, ${shlibs:Depends} +Depends: ${misc:Depends}, coreutils | fileutils (>= 4.0), linux-headers-3.2.0-1496, ${shlibs:Depends} Provides: linux-ti-omap4-headers, linux-ti-omap4-headers-2.6 Description: Linux kernel headers for version 3.2.0 on TI OMAP4-based systems This package provides kernel header files for version 3.2.0 on TI OMAP4-based systems. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-ti-omap4-headers-3.2.0-1495/debian.README.gz for details. + /usr/share/doc/linux-ti-omap4-headers-3.2.0-1496/debian.README.gz for details. -Package: linux-image-3.2.0-1495-omap4-dbgsym +Package: linux-image-3.2.0-1496-omap4-dbgsym Architecture: armel armhf Section: devel Priority: optional diff -Nru linux-ti-omap4-3.2.0/debian.ti-omap4/d-i/kernel-versions linux-ti-omap4-3.2.0/debian.ti-omap4/d-i/kernel-versions --- linux-ti-omap4-3.2.0/debian.ti-omap4/d-i/kernel-versions 2016-11-30 10:55:24.000000000 +0000 +++ linux-ti-omap4-3.2.0/debian.ti-omap4/d-i/kernel-versions 2016-12-05 11:45:02.000000000 +0000 @@ -1,4 +1,4 @@ # arch version flavour installedname suffix bdep -armel 3.2.0-1495 omap4 3.2.0-1495-omap4 - +armel 3.2.0-1496 omap4 3.2.0-1496-omap4 - -armhf 3.2.0-1495 omap4 3.2.0-1495-omap4 - +armhf 3.2.0-1496 omap4 3.2.0-1496-omap4 - diff -Nru linux-ti-omap4-3.2.0/drivers/hv/hv_util.c linux-ti-omap4-3.2.0/drivers/hv/hv_util.c --- linux-ti-omap4-3.2.0/drivers/hv/hv_util.c 2016-11-30 10:40:56.000000000 +0000 +++ linux-ti-omap4-3.2.0/drivers/hv/hv_util.c 2016-12-05 11:14:58.000000000 +0000 @@ -226,14 +226,10 @@ struct heartbeat_msg_data *heartbeat_msg; u8 *hbeat_txf_buf = util_heartbeat.recv_buffer; - while (1) { - - vmbus_recvpacket(channel, hbeat_txf_buf, - PAGE_SIZE, &recvlen, &requestid); - - if (!recvlen) - break; + vmbus_recvpacket(channel, hbeat_txf_buf, + PAGE_SIZE, &recvlen, &requestid); + if (recvlen > 0) { icmsghdrp = (struct icmsg_hdr *)&hbeat_txf_buf[ sizeof(struct vmbuspipe_hdr)]; diff -Nru linux-ti-omap4-3.2.0/fs/proc/base.c linux-ti-omap4-3.2.0/fs/proc/base.c --- linux-ti-omap4-3.2.0/fs/proc/base.c 2016-11-30 10:40:56.000000000 +0000 +++ linux-ti-omap4-3.2.0/fs/proc/base.c 2016-12-05 11:15:01.000000000 +0000 @@ -956,8 +956,7 @@ mm = mm_for_maps(task); ret = PTR_ERR(mm); - /* Ensure the process spawned far enough to have an environment. */ - if (!mm || IS_ERR(mm) || !mm->env_end) + if (!mm || IS_ERR(mm)) goto out_free; ret = 0; diff -Nru linux-ti-omap4-3.2.0/net/packet/af_packet.c linux-ti-omap4-3.2.0/net/packet/af_packet.c --- linux-ti-omap4-3.2.0/net/packet/af_packet.c 2016-11-30 10:35:23.000000000 +0000 +++ linux-ti-omap4-3.2.0/net/packet/af_packet.c 2016-12-05 11:24:26.000000000 +0000 @@ -3077,19 +3077,25 @@ if (optlen != sizeof(val)) return -EINVAL; - if (po->rx_ring.pg_vec || po->tx_ring.pg_vec) - return -EBUSY; if (copy_from_user(&val, optval, sizeof(val))) return -EFAULT; switch (val) { case TPACKET_V1: case TPACKET_V2: case TPACKET_V3: - po->tp_version = val; - return 0; + break; default: return -EINVAL; } + lock_sock(sk); + if (po->rx_ring.pg_vec || po->tx_ring.pg_vec) { + ret = -EBUSY; + } else { + po->tp_version = val; + ret = 0; + } + release_sock(sk); + return ret; } case PACKET_RESERVE: { @@ -3560,6 +3566,7 @@ /* Added to avoid minimal code churn */ struct tpacket_req *req = &req_u->req; + lock_sock(sk); /* Opening a Tx-ring is NOT supported in TPACKET_V3 */ if (!closing && tx_ring && (po->tp_version > TPACKET_V2)) { WARN(1, "Tx-ring is not supported.\n"); @@ -3637,7 +3644,6 @@ goto out; } - lock_sock(sk); /* Detach socket from network */ spin_lock(&po->bind_lock); @@ -3686,11 +3692,11 @@ if (!tx_ring) prb_shutdown_retire_blk_timer(po, tx_ring, rb_queue); } - release_sock(sk); if (pg_vec) free_pg_vec(pg_vec, order, req->tp_block_nr); out: + release_sock(sk); return err; }