Add acpi video NULL deref fix, fwd from akpm

diff --git a/queue/acpi-fix-null-deref-in-video-lcd-brightness.patch b/queue/acpi-fix-null-deref-in-video-lcd-brightness.patch
new file mode 100644 (file)
index 0000000..c591389
--- /dev/null
+++ b/queue/acpi-fix-null-deref-in-video-lcd-brightness.patch
@@ -0,0 +1,38 @@
+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 <luming.yu@gmail.com>
+
+Fix Null pointer deref in video/lcd/brightness
+http://bugzilla.kernel.org/show_bug.cgi?id=5571
+
+Signed-off-by: Yu Luming <luming.yu@gmail.com>
+Cc: "Brown, Len" <len.brown@intel.com>
+Signed-off-by: Thomas Renninger <trenn@suse.de>
+Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+Signed-off-by: Chris Wright <chrisw@redhat.com>
+---
+
+ drivers/acpi/video.c |    2 +-
+ 1 files changed, 1 insertion(+), 1 deletion(-)
+
+Index: linux-2.6.14.y/drivers/acpi/video.c
+===================================================================
+--- linux-2.6.14.y.orig/drivers/acpi/video.c
++++ linux-2.6.14.y/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 2af0781bf4ffdc5ae2c0a7c355cf2f7c6481acae..cc7fb702e62e9331ba23543c78e1c5b877d563ab 100644 (file)
--- a/queue/series
+++ b/queue/series
@@ -2,3 +2,4 @@ acpi-add-support-for-fadt-p_lvl2_up-flag.patch
 acpi-prefer-_cst-over-fadt-for-c-state-capabilities.patch
 fix-cta_proto_num-attribute-size-in-ctnetlink.patch
 fix-unbalanced-read_unlock_bh-in-ctnetlink.patch
+acpi-fix-null-deref-in-video-lcd-brightness.patch