Bug#807917: jessie-pu: package nvidia-graphics-drivers-legacy-304xx/304.131-1
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu
This is the last pu request for fixing CVE-2015-7869 in the
non-free nvidia driver. Same changes as in the other packages.
Andreas
Index: debian/control
===================================================================
--- debian/control (.../tags/304.128-1) (revision 5951)
+++ debian/control (.../branches/jessie) (revision 5951)
@@ -98,7 +98,7 @@
nvidia-installer-cleanup,
${misc:Pre-Depends}
Depends:
- ${nvidia-alternative},
+ ${nvidia-alternative} (= ${binary:Version}),
nvidia-installer-cleanup (>= 20130816) [i386],
nvidia-support,
${shlibs:Depends}, ${misc:Depends}
Index: debian/rules.defs
===================================================================
--- debian/rules.defs (.../tags/304.128-1) (revision 5951)
+++ debian/rules.defs (.../branches/jessie) (revision 5951)
@@ -2,8 +2,8 @@
NVIDIA_LEGACY = 304
#WATCH_VERSION =
-XORG_ABI_LIST = 19 18 15 14 13 12 11 10 8 6.0
-XORG_BOUND = (<< 2:1.17.99)
+XORG_ABI_LIST = 20 19 18 15 14 13 12 11 10 8 6.0
+XORG_BOUND = (<< 2:1.18.99)
LINUX_KMOD_TESTED = 4.2
LINUX_KMOD_TESTED_amd64 =
Index: debian/module/conftest.h
===================================================================
--- debian/module/conftest.h (.../tags/304.128-1) (revision 5951)
+++ debian/module/conftest.h (.../branches/jessie) (revision 5951)
@@ -1,4 +1,4 @@
-/* synchronized with conftest.sh from 352.41, 349.16, 346.96, 343.36, 340.93, 304.128, 173.14.39, 96.43.23, 71.86.15 */
+/* synchronized with conftest.sh from 358.16, 355.11, 352.63, 349.16, 346.96, 343.36, 340.96, 304.131, 173.14.39, 96.43.23, 71.86.15 */
#ifndef LINUX_VERSION_CODE
#include <linux/version.h>
@@ -348,9 +348,13 @@
#endif
/* Implement conftest.sh function scatterlist */
+/* The logic and the define were reversed from HAS_PAGE
+ to HAS_PAGE_LINK in 304.131/340.96/352.63 */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+ #undef NV_SCATTERLIST_HAS_PAGE_LINK
#define NV_SCATTERLIST_HAS_PAGE
#else
+ #define NV_SCATTERLIST_HAS_PAGE_LINK
#undef NV_SCATTERLIST_HAS_PAGE
#endif
@@ -548,6 +552,13 @@
#undef NV_LIST_CUT_POSITION_PRESENT
#endif
+/* Implement conftest.sh function hlist_for_each_entry */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)
+ #define NV_HLIST_FOR_EACH_ENTRY_ARGUMENT_COUNT 3
+#else
+ #define NV_HLIST_FOR_EACH_ENTRY_ARGUMENT_COUNT 4
+#endif
+
/* Implement conftest.sh function file_inode */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)
#define NV_FILE_HAS_INODE
@@ -630,6 +641,29 @@
#undef NV_WRITE_CR4_PRESENT
#endif
+/* Implement conftest.sh function of_parse_phandle */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
+ #define NV_OF_PARSE_PHANDLE_PRESENT
+#else
+ #undef NV_OF_PARSE_PHANDLE_PRESENT
+#endif
+
+/* Implement conftest.sh function for_each_online_node */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
+ #define NV_FOR_EACH_ONLINE_NODE_PRESENT
+#else
+ #undef NV_FOR_EACH_ONLINE_NODE_PRESENT
+#endif
+
+/* Implement conftest.sh function node_end_pfn */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) || \
+ ((IS_ENABLED(CONFIG_X86) || IS_ENABLED(CONFIG_PPC)) && \
+ LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
+ #define NV_NODE_END_PFN_PRESENT
+#else
+ #undef NV_NODE_END_PFN_PRESENT
+#endif
+
/* Check for linux/semaphore.h */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
#define NV_LINUX_SEMAPHORE_H_PRESENT
Index: debian/changelog
===================================================================
--- debian/changelog (.../tags/304.128-1) (revision 5951)
+++ debian/changelog (.../branches/jessie) (revision 5951)
@@ -1,3 +1,25 @@
+nvidia-graphics-drivers-legacy-304xx (304.131-1) jessie; urgency=medium
+
+ * New upstream legacy 304xx branch release 304.131 (2015-11-16).
+ * Fixed CVE-2015-7869: Unsanitized User Mode Input. (Closes: #805918)
+ - Fixed a bug that could cause texture corruption in some OpenGL
+ applications when video memory is exhausted by a combination of
+ simultaneously running graphical and compute workloads.
+ - Added support for X.Org xserver ABI 20 (xorg-server 1.18).
+ * Improved compatibility with recent Linux kernels.
+ * Synchronize packaging with nvidia-graphics-drivers 340.96-1:
+ - d/control: Make dependencies on nvidia-legacy-340xx-alternative strictly
+ versioned to prevent partial upgrades.
+ * Synchronize packaging with nvidia-graphics-drivers 304.131-1:
+ - Add xorg-video-abi-20 as alternative dependency.
+ * conftest.h:
+ - Implement new conftest.sh functions hlist_for_each_entry,
+ of_parse_phandle, for_each_online_node, node_end_pfn (358.09).
+ - Update conftest.sh function scatterlist for logic reversal in
+ 304.131/340.96/352.63, support both ways.
+
+ -- Andreas Beckmann <anbe@debian.org> Mon, 14 Dec 2015 12:56:19 +0100
+
nvidia-graphics-drivers-legacy-304xx (304.128-1) jessie; urgency=medium
* New upstream legacy 304xx branch release 304.128 (2015-08-31).
@@ -4,6 +26,7 @@
* Fixed CVE-2015-5950: Memory corruption due to an unsanitized pointer.
(Closes: #800567)
* Improved compatibility with recent Linux kernels.
+ (Closes: #801193, #802452)
* Removed f_path.dentry.patch, fixed upstream.
* Removed fixes-for-kernel-4.0.0.patch, fixed upstream.
* Synchronize packaging with nvidia-graphics-drivers 340.93-0+deb8u1:
Property changes on: .
___________________________________________________________________
Added: svn:mergeinfo
Merged /packages/nvidia-graphics-drivers/branches/304:r3148-3478,4676-5944
Merged /packages/nvidia-graphics-drivers/branches/304-jessie:r3566-3819
Merged /packages/nvidia-graphics-drivers/branches/313:r3576-4381
Merged /packages/nvidia-graphics-drivers/branches/331:r4424-4683
Merged /packages/nvidia-graphics-drivers/branches/340:r5309-5945
Merged /packages/nvidia-graphics-drivers/branches/325:r3946-4423
Merged /packages/nvidia-graphics-drivers/branches/304.51:r3420-3423
Merged /packages/nvidia-graphics-drivers/branches/304.60:r3473-3565
Merged /packages/nvidia-graphics-drivers/branches/319:r3826-4401
Merged /packages/nvidia-graphics-drivers/trunk:r4185-5308
Merged /packages/nvidia-graphics-drivers/branches/304-wheezy:r3714-5930
Merged /packages/nvidia-graphics-drivers/branches/jessie:r5163-5181
Merged /packages/nvidia-graphics-drivers/branches/310:r3423-4351
Reply to: