From: Chris Wright Date: Tue, 22 Nov 2005 21:12:16 +0000 (-0800) Subject: drop acpi-fix-null-deref for now, since it's not yet upstream X-Git-Tag: v2.6.14.3~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2401487829f78389a9f662e2b32ee84e5bf05a21;p=thirdparty%2Fkernel%2Fstable-queue.git drop acpi-fix-null-deref for now, since it's not yet upstream --- diff --git a/queue/acpi-fix-null-deref-in-video-lcd-brightness.patch b/queue/acpi-fix-null-deref-in-video-lcd-brightness.patch deleted file mode 100644 index aaaeded5702..00000000000 --- a/queue/acpi-fix-null-deref-in-video-lcd-brightness.patch +++ /dev/null @@ -1,34 +0,0 @@ -From stable-bounces@linux.kernel.org Sat Nov 19 15:41:57 2005 -Message-Id: <200511192354.jAJNs0Aw015608@shell0.pdx.osdl.net> -To: luming.yu@gmail.com, len.brown@intel.com, nacc@us.ibm.com, stable@kernel.org, trenn@suse.de, mm-commits@vger.kernel.org -From: akpm@osdl.org -Date: Sat, 19 Nov 2005 15:53:56 -0800 -Cc: -Subject: apci: fix NULL deref in video/lcd/brightness - -From: Yu Luming - -Fix Null pointer deref in video/lcd/brightness -http://bugzilla.kernel.org/show_bug.cgi?id=5571 - -Signed-off-by: Yu Luming -Cc: "Brown, Len" -Signed-off-by: Thomas Renninger -Signed-off-by: Nishanth Aravamudan -Signed-off-by: Andrew Morton -Signed-off-by: Greg Kroah-Hartman ---- - drivers/acpi/video.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- linux-2.6.14.2.orig/drivers/acpi/video.c -+++ linux-2.6.14.2/drivers/acpi/video.c -@@ -813,7 +813,7 @@ acpi_video_device_write_brightness(struc - - ACPI_FUNCTION_TRACE("acpi_video_device_write_brightness"); - -- if (!dev || count + 1 > sizeof str) -+ if (!dev || !dev->brightness || count + 1 > sizeof str) - return_VALUE(-EINVAL); - - if (copy_from_user(str, buffer, count)) diff --git a/queue/series b/queue/series index 89b08cecc94..537669f4c1a 100644 --- a/queue/series +++ b/queue/series @@ -17,7 +17,6 @@ fix-memory-management-error-during.patch fix-calculation-of-ah-length-during.patch fix-sending-extension-headers-before.patch 4GB-memory-intel-dual-core.patch -acpi-fix-null-deref-in-video-lcd-brightness.patch drivers-isdn-hardware-eicon-os_4bri.c-correct-the-xdiloadfile-signature.patch hwmon-w83627hf-missing-in0-limit-check.patch hwmon-lm78-fix-vid.patch