r3677 - in
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: .
patches patches/series
Simon Horman
horms at costa.debian.org
Wed Aug 3 02:30:03 UTC 2005
Author: horms
Date: 2005-08-03 02:30:02 +0000 (Wed, 03 Aug 2005)
New Revision: 3677
Added:
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/173_tty_ldisc_ref-return-null-check.diff
Removed:
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/173_v4l-cx88-hue-offset-fix.diff
Modified:
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-11
Log:
had the wrong patch
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog 2005-08-02 09:58:49 UTC (rev 3676)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog 2005-08-03 02:30:02 UTC (rev 3677)
@@ -32,7 +32,7 @@
[ppc32] stop misusing ntps time_offset value
(Simon Horman)
- * 173_v4l-cx88-hue-offset-fix.diff
+ * 173_tty_ldisc_ref-return-null-check.diff
tty_ldisc_ref return null check
(Simon Horman)
@@ -52,7 +52,7 @@
Fix ldisc ref count handling in rocketport driver
(Simon Horman)
- -- Simon Horman <horms at debian.org> Tue, 2 Aug 2005 19:45:34 +0900
+ -- Simon Horman <horms at debian.org> Wed, 3 Aug 2005 14:09:58 +0900
kernel-source-2.4.27 (2.4.27-10) unstable; urgency=low
Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/173_tty_ldisc_ref-return-null-check.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/173_tty_ldisc_ref-return-null-check.diff 2005-08-02 09:58:49 UTC (rev 3676)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/173_tty_ldisc_ref-return-null-check.diff 2005-08-03 02:30:02 UTC (rev 3677)
@@ -0,0 +1,59 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR at EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: coverity: tty_ldisc_ref return null check
+## DP: Patch author: KAMBAROV, ZAUR <kambarov at berkeley.edu>
+## DP: Upstream status: upstream
+
+. $(dirname $0)/DPATCH
+
+ at DPATCH@
+From: KAMBAROV, ZAUR <kambarov at berkeley.edu>
+Date: Thu, 30 Jun 2005 01:12:05 +0000 (-0700)
+Subject: [PATCH] coverity: tty_ldisc_ref return null check
+X-Git-Tag: v2.6.12.3
+X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/gregkh/linux-2.6.12.y.git;a=commitdiff;h=19a51b0ee71ee00497619f441c59b4acd44cf1e5
+
+ [PATCH] coverity: tty_ldisc_ref return null check
+
+ We add a check of the return value of tty_ldisc_ref(), which
+ is checked 7 out of 8 times, e.g.:
+
+ 149 ld = tty_ldisc_ref(tty);
+ 150 if (ld != NULL) {
+ 151 if (ld->set_termios)
+ 152 (ld->set_termios)(tty, &old_termios);
+ 153 tty_ldisc_deref(ld);
+ 154 }
+
+ This defect was found automatically by Coverity Prevent, a static analysis
+ tool.
+
+ (akpm: presumably `ld' is never NULL. Oh well)
+
+ Signed-off-by: Zaur Kambarov <zkambarov at coverity.com>
+ Acked-by: Alan Cox <alan at lxorguk.ukuu.org.uk>
+ Signed-off-by: Andrew Morton <akpm at osdl.org>
+ Signed-off-by: Chris Wright <chrisw at osdl.org>
+ Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+---
+
+Backported to Debian's kernel-source-2.6.8 by dann frazier <dannf at debian.org>
+
+--- a/drivers/char/tty_ioctl.c
++++ b/drivers/char/tty_ioctl.c
+@@ -476,11 +476,11 @@ int n_tty_ioctl(struct tty_struct * tty,
+ ld = tty_ldisc_ref(tty);
+ switch (arg) {
+ case TCIFLUSH:
+- if (ld->flush_buffer)
++ if (ld && ld->flush_buffer)
+ ld->flush_buffer(tty);
+ break;
+ case TCIOFLUSH:
+- if (ld->flush_buffer)
++ if (ld && ld->flush_buffer)
+ ld->flush_buffer(tty);
+ /* fall through */
+ case TCOFLUSH:
Deleted: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/173_v4l-cx88-hue-offset-fix.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/173_v4l-cx88-hue-offset-fix.diff 2005-08-02 09:58:49 UTC (rev 3676)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/173_v4l-cx88-hue-offset-fix.diff 2005-08-03 02:30:02 UTC (rev 3677)
@@ -1,31 +0,0 @@
-From: Michael Krufky <mkrufky at m1k.net>
-Date: Thu, 30 Jun 2005 20:06:41 +0000 (-0400)
-Subject: [PATCH] v4l cx88 hue offset fix
-X-Git-Tag: v2.6.12.3
-X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/gregkh/linux-2.6.12.y.git;a=commitdiff;h=aebaaf4060dd0db163694da8e4ab7ba86add57b9
-
- [PATCH] v4l cx88 hue offset fix
-
- Changed hue offset to 128 to correct behavior in cx88 cards. Previously,
- setting 0% or 100% hue was required to avoid blue/green people on screen.
- Now, 50% Hue means no offset, just like bt878 stuff.
-
- Signed-off-by: Michael Krufky <mkrufky at m1k.net>
- Signed-off-by: Mauro Carvalho Chehab <mchehab at brturbo.com.br>
- Signed-off-by: Chris Wright <chrisw at osdl.org>
- Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
----
-
-Backported to Debian's kernel-source-2.6.8 by dann frazier <dannf at debian.org>
-
---- a/drivers/media/video/cx88/cx88-video.c
-+++ b/drivers/media/video/cx88/cx88-video.c
-@@ -261,7 +261,7 @@ static struct cx88_ctrl cx8800_ctls[] =
- .default_value = 0,
- .type = V4L2_CTRL_TYPE_INTEGER,
- },
-- .off = 0,
-+ .off = 128,
- .reg = MO_HUE,
- .mask = 0x00ff,
- .shift = 0,
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-11
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-11 2005-08-02 09:58:49 UTC (rev 3676)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-11 2005-08-03 02:30:02 UTC (rev 3677)
@@ -5,7 +5,7 @@
+ 170_Makefile.gcc-3.3.diff
+ 171_arch-ia64-x86_64-execve-overflow.diff
+ 172_ppc32-time_offset-misuse.diff
-+ 173_v4l-cx88-hue-offset-fix.diff
++ 173_tty_ldisc_ref-return-null-check.diff
+ 174_net-ipv4-netfilter-nat-mem.diff
+ 175-net-ipv6-netfilter-deadlock.diff
+ 176_net-ipv4-netfilter-untracked-refcount.diff
More information about the Kernel-svn-changes
mailing list