[kernel] r17060 - in dists/squeeze/linux-2.6/debian/patches: bugfix/all bugfix/all/stable features/all series
Ben Hutchings
benh at alioth.debian.org
Sat Mar 12 20:47:34 UTC 2011
Author: benh
Date: Sat Mar 12 20:47:33 2011
New Revision: 17060
Log:
Replace modified 2.6.32.32-rc1.patch with auto-generated 2.6.32.32.patch
All changes to drivers/gpu/drm and include/drm are excluded from the
patches we generate from 2.6.32.y. Re-add the separate patch that was
previously included.
Resolve conflict with our r8169 changes by removing and re-applying
them, not by fixing up the stable patch.
Although this appears to change history, I have verified that the
modified patch series 31 produces the exact same output.
Added:
dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-fix-unsigned-vs-signed-comparison-issue-in-modes.patch
dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.32.patch
- copied, changed from r16986, dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.32-rc1.patch
dists/squeeze/linux-2.6/debian/patches/features/all/r8169-remove-the-firmware-of-RTL8111D-2.patch
- copied, changed from r16986, dists/squeeze/linux-2.6/debian/patches/features/all/r8169-remove-the-firmware-of-RTL8111D.patch
Deleted:
dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.32-rc1.patch
Modified:
dists/squeeze/linux-2.6/debian/patches/series/31
Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-fix-unsigned-vs-signed-comparison-issue-in-modes.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/drm-fix-unsigned-vs-signed-comparison-issue-in-modes.patch Sat Mar 12 20:47:33 2011 (r17060)
@@ -0,0 +1,36 @@
+From: Dave Airlie <airlied at redhat.com>
+Date: Thu, 24 Feb 2011 08:35:06 +1000
+Subject: [PATCH] drm: fix unsigned vs signed comparison issue in modeset ctl ioctl.
+
+commit 1922756124ddd53846877416d92ba4a802bc658f upstream.
+
+This fixes CVE-2011-1013.
+
+Reported-by: Matthiew Herrb (OpenBSD X.org team)
+Cc: stable at kernel.org
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+[bwh: Adjust for Debian's 2.6.32]
+---
+--- a/drivers/gpu/drm/drm_irq.c
++++ b/drivers/gpu/drm/drm_irq.c
+@@ -543,7 +543,8 @@ int drm_modeset_ctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv)
+ {
+ struct drm_modeset_ctl *modeset = data;
+- int crtc, ret = 0;
++ int ret = 0;
++ unsigned int crtc;
+
+ /* If drm_vblank_init() hasn't been called yet, just no-op */
+ if (!dev->num_crtcs)
+--- a/include/drm/drmP.h
++++ b/include/drm/drmP.h
+@@ -1020,7 +1020,7 @@ struct drm_device {
+ struct pci_controller *hose;
+ #endif
+ struct drm_sg_mem *sg; /**< Scatter gather memory */
+- int num_crtcs; /**< Number of CRTCs on this device */
++ unsigned int num_crtcs; /**< Number of CRTCs on this device */
+ void *dev_private; /**< device private data */
+ void *mm_private;
+ struct address_space *dev_mapping;
Copied and modified: dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.32.patch (from r16986, dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.32-rc1.patch)
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.32-rc1.patch Sat Mar 5 13:19:06 2011 (r16986, copy source)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.32.patch Sat Mar 12 20:47:33 2011 (r17060)
@@ -1,3 +1,5 @@
+diff --git a/Makefile b/Makefile
+index e734450..c3f6287 100644
diff --git a/arch/x86/include/asm/smpboot_hooks.h b/arch/x86/include/asm/smpboot_hooks.h
index 1def601..cfdc6c8 100644
--- a/arch/x86/include/asm/smpboot_hooks.h
@@ -13,18 +15,6 @@
static inline void __init smpboot_setup_io_apic(void)
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 332d743..c8b5a7b 100644
---- a/drivers/gpu/drm/drm_irq.c
-+++ b/drivers/gpu/drm/drm_irq.c
-@@ -540,7 +540,8 @@ int drm_modeset_ctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv)
- {
- struct drm_modeset_ctl *modeset = data;
-- int crtc, ret = 0;
-+ int ret = 0;
-+ unsigned int crtc;
-
- /* If drm_vblank_init() hasn't been called yet, just no-op */
- if (!dev->num_crtcs)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 1597863..5e1b522 100644
--- a/drivers/hid/hid-core.c
@@ -121,9 +111,9 @@
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -23,6 +23,7 @@
+ #include <linux/tcp.h>
#include <linux/init.h>
#include <linux/dma-mapping.h>
- #include <linux/firmware.h>
+#include <linux/pci-aspm.h>
#include <asm/system.h>
@@ -456,17 +446,6 @@
}
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 7ad3faa..66713c6 100644
---- a/include/drm/drmP.h
-+++ b/include/drm/drmP.h
-@@ -1016,7 +1016,7 @@ struct drm_device {
- struct pci_controller *hose;
- #endif
- struct drm_sg_mem *sg; /**< Scatter gather memory */
-- int num_crtcs; /**< Number of CRTCs on this device */
-+ unsigned int num_crtcs; /**< Number of CRTCs on this device */
- void *dev_private; /**< device private data */
- void *mm_private;
- struct address_space *dev_mapping;
diff --git a/include/net/sctp/command.h b/include/net/sctp/command.h
index 8be5135..2c55a7e 100644
--- a/include/net/sctp/command.h
Copied and modified: dists/squeeze/linux-2.6/debian/patches/features/all/r8169-remove-the-firmware-of-RTL8111D-2.patch (from r16986, dists/squeeze/linux-2.6/debian/patches/features/all/r8169-remove-the-firmware-of-RTL8111D.patch)
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/features/all/r8169-remove-the-firmware-of-RTL8111D.patch Sat Mar 5 13:19:06 2011 (r16986, copy source)
+++ dists/squeeze/linux-2.6/debian/patches/features/all/r8169-remove-the-firmware-of-RTL8111D-2.patch Sat Mar 12 20:47:33 2011 (r17060)
@@ -44,9 +44,9 @@
#include <linux/init.h>
#include <linux/dma-mapping.h>
+#include <linux/firmware.h>
+ #include <linux/pci-aspm.h>
#include <asm/system.h>
- #include <asm/io.h>
@@ -32,6 +33,9 @@
#define MODULENAME "r8169"
#define PFX MODULENAME ": "
Modified: dists/squeeze/linux-2.6/debian/patches/series/31
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/31 Sat Mar 12 20:39:11 2011 (r17059)
+++ dists/squeeze/linux-2.6/debian/patches/series/31 Sat Mar 12 20:47:33 2011 (r17060)
@@ -31,6 +31,8 @@
+ bugfix/all/af_unix-limit-recursion-level.patch
+ debian/af_unix-Avoid-ABI-change-from-introduction-of-recursion-limit.patch
+ features/all/hwmon-k10temp.patch
++ bugfix/all/drm-fix-unsigned-vs-signed-comparison-issue-in-modes.patch
++ debian/drm-Avoid-ABI-change-from-fix-for-CVE-2011-1013.patch
- bugfix/all/sctp-fix-out-of-bounds-reading-in-sctp_assoc_get_hmac.patch
- bugfix/all/tcp-Make-TCP_MAXSEG-minimum-more-correct.patch
- bugfix/all/tcp-Increase-TCP_MAXSEG-socket-option-minimum.patch
@@ -40,8 +42,11 @@
+ bugfix/all/stable/2.6.32.30.patch
+ bugfix/all/drm-ttm-Fix-two-race-conditions-fix-busy-codepaths.patch
+ bugfix/all/stable/2.6.32.31.patch
-+ bugfix/all/stable/2.6.32.32-rc1.patch
-+ debian/drm-Avoid-ABI-change-from-fix-for-CVE-2011-1013.patch
+- bugfix/all/r8169-keep-firmware-in-memory.patch
+- features/all/r8169-remove-the-firmware-of-RTL8111D.patch
++ bugfix/all/stable/2.6.32.32.patch
++ features/all/r8169-remove-the-firmware-of-RTL8111D-2.patch
++ bugfix/all/r8169-keep-firmware-in-memory.patch
+ bugfix/all/drm-i915-add-dependency-on-config_tmpfs.patch
+ bugfix/all/drm-i915-lvds-add-aopen-i915gmm-hfs-to-the-list-of-false-positive-lvds.patch
+ bugfix/all/drm-radeon-kms-add-pll-debugging-output.patch
More information about the Kernel-svn-changes
mailing list