From: Maxim Uvarov <maxim.uvarov@oracle.com>
Date: Thu, 17 May 2012 18:24:29 +0000 (-0700)
Subject: SPEC: v2.6.39-200.11.0
X-Git-Tag: v2.6.39-400.9.0~423^2~27
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=608722dcd693502036fbd02d932750bb9f0e8436;p=users%2Fjedix%2Flinux-maple.git

SPEC: v2.6.39-200.11.0

Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>
---

diff --git a/uek-rpm/ol5/kernel-uek.spec b/uek-rpm/ol5/kernel-uek.spec
index 6b8c9f77b8b1..e5696f62bf07 100644
--- a/uek-rpm/ol5/kernel-uek.spec
+++ b/uek-rpm/ol5/kernel-uek.spec
@@ -190,7 +190,7 @@ Summary: The Linux kernel
 %endif
 
 %if %{rhel}
-%define pkg_release %{distro_build}.10.0%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.11.0%{?dist}uek%{?buildid}
 %endif
 %define KVERREL %{rpmversion}-%{pkg_release}
 
@@ -1680,6 +1680,14 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu May 17 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.11.0.el6uek]
+- [dm] do not forward ioctls from logical volumes to the underlying device (Joe
+  Jin)  {CVE-2011-4127}
+- [block] fail SCSI passthrough ioctls on partition devices (Joe Jin)
+  {CVE-2011-4127}
+- [block] add and use scsi_blk_cmd_ioctl (Joe Jin) [Orabug: 14056755]
+  {CVE-2011-4127}
+
 * Wed May 16 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.10.0.el5uek]
 - net: ipv4: relax AF_INET check in bind() (Eric Dumazet) [Orabug: 14054411]
 - xen-netback: fix the number of skb slots calculation. (Adnan Misherfi)
diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec
index aff424b60c70..9cea205839a5 100644
--- a/uek-rpm/ol6/kernel-uek.spec
+++ b/uek-rpm/ol6/kernel-uek.spec
@@ -198,7 +198,7 @@ Summary: The Linux kernel
 %endif
 
 %if %{rhel}
-%define pkg_release %{distro_build}.10.0%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.11.0%{?dist}uek%{?buildid}
 %endif
 %define KVERREL %{rpmversion}-%{pkg_release}.%{_target_cpu}
 
@@ -1692,6 +1692,14 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu May 17 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.11.0.el6uek]
+- [dm] do not forward ioctls from logical volumes to the underlying device (Joe
+  Jin)  {CVE-2011-4127}
+- [block] fail SCSI passthrough ioctls on partition devices (Joe Jin)
+  {CVE-2011-4127}
+- [block] add and use scsi_blk_cmd_ioctl (Joe Jin) [Orabug: 14056755]
+  {CVE-2011-4127}
+
 * Wed May 16 2012 Maxim Uvarov <maxim.uvarov@oracle.com> [2.6.39-200.10.0.el6uek]
 - net: ipv4: relax AF_INET check in bind() (Eric Dumazet) [Orabug: 14054411]
 - xen-netback: fix the number of skb slots calculation. (Adnan Misherfi)