From: Chris Wright Date: Wed, 6 Jun 2007 20:50:26 +0000 (-0700) Subject: update the 2.6.20 queue X-Git-Tag: v2.6.20.13~10^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=47dd8f88bbe0eef758e1eb6fe31c386ebe739f90;p=thirdparty%2Fkernel%2Fstable-queue.git update the 2.6.20 queue --- diff --git a/queue-2.6.20/kbuild-fixdep-segfault-on-pathological-string-o-death.patch b/queue-2.6.20/kbuild-fixdep-segfault-on-pathological-string-o-death.patch new file mode 100644 index 00000000000..b8c9f867cdf --- /dev/null +++ b/queue-2.6.20/kbuild-fixdep-segfault-on-pathological-string-o-death.patch @@ -0,0 +1,37 @@ +From stable-bounces@linux.kernel.org Wed May 2 12:49:39 2007 +Date: Wed, 2 May 2007 21:48:37 +0200 +From: Sam Ravnborg +To: stable@kernel.org +Cc: Chuck Ebbert +Message-ID: <465F0E83.3090003@redhat.com> +Subject: kbuild: fixdep segfault on pathological string-o-death + +From: Andy Green + +build scripts: fixdep blows segfault on string CONFIG_MODULE seen + +The string "CONFIG_MODULE" appearing anywhere in a source file causes +fixdep to segfault. This string appeared in the wild in the current +mISDN sources (I think they meant CONFIG_MODULES). But it shouldn't +segfault (esp as CONFIG_MODULE appeared in a quoted string). + +Signed-off-by: Andy Green +Signed-off-by: Sam Ravnborg +Signed-off-by: Chris Wright +--- +Fixes https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=241915 + + scripts/basic/fixdep.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- linux-2.6.20.12.orig/scripts/basic/fixdep.c ++++ linux-2.6.20.12/scripts/basic/fixdep.c +@@ -249,6 +249,8 @@ void parse_config_file(char *map, size_t + found: + if (!memcmp(q - 7, "_MODULE", 7)) + q -= 7; ++ if( (q-p-7) < 0 ) ++ continue; + use_config(p+7, q-p-7); + } + } diff --git a/queue-2.6.20/ntfs_init_locked_inode-fix-array-indexing.patch b/queue-2.6.20/ntfs_init_locked_inode-fix-array-indexing.patch new file mode 100644 index 00000000000..44c248ac6ff --- /dev/null +++ b/queue-2.6.20/ntfs_init_locked_inode-fix-array-indexing.patch @@ -0,0 +1,31 @@ +From 1fc799e1b4efdbc405d87d9f154d64d9bc299e5c Mon Sep 17 00:00:00 2001 +From: Andrew Morton +Date: Thu, 31 May 2007 00:40:49 -0700 +Subject: ntfs_init_locked_inode(): fix array indexing + +Local variable `i' is a byte-counter. Don't use it as an index into an array +of le32's. + +Reported-by: "young dave" +Cc: "Christoph Lameter" +Acked-by: Anton Altaparmakov +Cc: +Cc: Adrian Bunk +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Chris Wright +--- + fs/ntfs/inode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- linux-2.6.20.12.orig/fs/ntfs/inode.c ++++ linux-2.6.20.12/fs/ntfs/inode.c +@@ -141,7 +141,7 @@ static int ntfs_init_locked_inode(struct + if (!ni->name) + return -ENOMEM; + memcpy(ni->name, na->name, i); +- ni->name[i] = 0; ++ ni->name[na->name_len] = 0; + } + return 0; + } diff --git a/queue-2.6.20/series b/queue-2.6.20/series index 0a387085b1e..b4d27255f38 100644 --- a/queue-2.6.20/series +++ b/queue-2.6.20/series @@ -11,3 +11,6 @@ crypto-api-read-module-pointer-before-freeing-algorithm.patch fuse-fix-mknod-of-regular-file.patch acpi-thermal-fix-mod_timer-interval.patch alsa-usb-audio-explicitly-match-logitech-quickcam.patch +v4l-dvb-budget-ci-fix-tuning-for-tdm-1316.patch +kbuild-fixdep-segfault-on-pathological-string-o-death.patch +ntfs_init_locked_inode-fix-array-indexing.patch diff --git a/queue-2.6.20/v4l-dvb-budget-ci-fix-tuning-for-tdm-1316.patch b/queue-2.6.20/v4l-dvb-budget-ci-fix-tuning-for-tdm-1316.patch new file mode 100644 index 00000000000..6db0b01e4a1 --- /dev/null +++ b/queue-2.6.20/v4l-dvb-budget-ci-fix-tuning-for-tdm-1316.patch @@ -0,0 +1,40 @@ +From 910a7b68350516e114294064fbec4a9e58f59efc Mon Sep 17 00:00:00 2001 +Message-ID: <465F1151.4010700@redhat.com> +From: Oliver Endriss +Cc: Chuck Ebbert , Dave Jones +Date: Thu, 3 May 2007 13:16:12 -0300 +Subject: V4L/DVB (5593): Budget-ci: Fix tuning for TDM 1316 (160..200 MHz) + +Revert changeset + http://linuxtv.org/hg/v4l-dvb?cmd=changeset;node=e7c424bbf9aa;style=gitweb + +Petri Helin found that this changeset broke tuning: + +'Well, after going through the changes that might have had effect on +tuning, I found out the one which had caused this problem. I do not know +the actual reason behind the change, but the changelog says that it +was meant to "Fix TD1316 tuner for DVBC". But at least in my case it +seams to have broken the tuner instead.' + +Signed-off-by: Oliver Endriss +Thanks-to: Petri Helin +Acked-by: e9hack +Acked-by: Thomas Kaiser +Signed-off-by: Mauro Carvalho Chehab +Acked-by: Michael Krufky +Signed-off-by: Chris Wright +--- + drivers/media/dvb/ttpci/budget-ci.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- linux-2.6.20.12.orig/drivers/media/dvb/ttpci/budget-ci.c ++++ linux-2.6.20.12/drivers/media/dvb/ttpci/budget-ci.c +@@ -892,7 +892,7 @@ static int dvbc_philips_tdm1316l_tuner_s + band = 1; + } else if (tuner_frequency < 200000000) { + cp = 6; +- band = 2; ++ band = 1; + } else if (tuner_frequency < 290000000) { + cp = 3; + band = 2;