r1501 - in trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches patches/series
Joshua Kwan
joshk@haydn.debian.org
Tue, 31 Aug 2004 22:53:55 -0600
Author: joshk
Date: 2004-08-31 21:49:05 -0600 (Tue, 31 Aug 2004)
New Revision: 1501
Added:
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/074_fealnx_ampersand.diff
trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/075_lvm_ioctl.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-5
Log:
add some fixes from DaveM and a pretty obvious one seen on LKML
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 2004-09-01 00:01:40 UTC (rev 1500)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog 2004-09-01 03:49:05 UTC (rev 1501)
@@ -10,8 +10,12 @@
controller through piix. (Closes: #254748)
* 073_tg3_hw_autoneg.diff: cset 1.1438.15.2 from linux-2.4, marked for
reversal in the series. The HW autoneg support caused too much trouble.
+ * 074_fealnx_ampersand.diff: Fix spurious ampersand in a
+ spin_unlock_irqrestore call that caused a hang on SMP.
+ * 075_lvm_ioctl.diff: Fix some problems with generic LVM ioctl handling,
+ patch by David S. Miller.
- -- Joshua Kwan <joshk@triplehelix.org> Mon, 30 Aug 2004 00:40:30 -0700
+ -- Joshua Kwan <joshk@triplehelix.org> Tue, 31 Aug 2004 20:46:53 -0700
kernel-source-2.4.27 (2.4.27-4) unstable; urgency=high
Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/074_fealnx_ampersand.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/074_fealnx_ampersand.diff 2004-09-01 00:01:40 UTC (rev 1500)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/074_fealnx_ampersand.diff 2004-09-01 03:49:05 UTC (rev 1501)
@@ -0,0 +1,11 @@
+--- kernel-source-2.4.27-2.4.27/drivers/net/fealnx.c~ 2004-08-30 01:53:29.000000000 -0700
++++ kernel-source-2.4.27-2.4.27/drivers/net/fealnx.c 2004-08-30 01:53:33.000000000 -0700
+@@ -1796,7 +1796,7 @@
+ unsigned long flags;
+ spin_lock_irqsave(lp, flags);
+ __set_rx_mode(dev);
+- spin_unlock_irqrestore(&lp, flags);
++ spin_unlock_irqrestore(lp, flags);
+ }
+
+
Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/075_lvm_ioctl.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/075_lvm_ioctl.diff 2004-09-01 00:01:40 UTC (rev 1500)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/075_lvm_ioctl.diff 2004-09-01 03:49:05 UTC (rev 1501)
@@ -0,0 +1,128 @@
+Path: main.gmane.org!not-for-mail
+From: "David S. Miller" <davem@davemloft.net>
+Newsgroups: gmane.linux.ports.sparc,gmane.linux.debian.ports.sparc
+Subject: [PATCH] Re: lvm problems on sparc64 - Trying to vfree() nonexistent
+ vm area
+Date: Mon, 30 Aug 2004 17:40:15 -0700
+Organization: DaveM Loft Enterprises
+Lines: 80
+Sender: sparclinux-owner@vger.kernel.org
+Approved: news@gmane.org
+Message-ID: <20040830174015.10edb69b.davem@davemloft.net>
+References: <1093911340.2116.55.camel@duncow>
+NNTP-Posting-Host: deer.gmane.org
+Mime-Version: 1.0
+Content-Type: text/plain; charset=US-ASCII
+Content-Transfer-Encoding: 7bit
+X-Trace: sea.gmane.org 1093912932 25423 80.91.224.253 (31 Aug 2004 00:42:12 GMT)
+X-Complaints-To: usenet@sea.gmane.org
+NNTP-Posting-Date: Tue, 31 Aug 2004 00:42:12 +0000 (UTC)
+Cc: sparclinux@vger.kernel.org, debian-sparc@lists.debian.org,
+ richm@oldelvet.org.uk, linux-lvm@sistina.com
+Original-X-From: sparclinux-owner@vger.kernel.org Tue Aug 31 02:42:02 2004
+Return-path: <sparclinux-owner@vger.kernel.org>
+Original-Received: from vger.kernel.org ([12.107.209.244])
+ by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian))
+ id 1C1win-00077m-00
+ for <lnx-sparclinux@gmane.org>; Tue, 31 Aug 2004 02:42:02 +0200
+Original-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
+ id S265847AbUHaAlj (ORCPT <rfc822;lnx-sparclinux@m.gmane.org>);
+ Mon, 30 Aug 2004 20:41:39 -0400
+Original-Received: (majordomo@vger.kernel.org) by vger.kernel.org id S265909AbUHaAlj
+ (ORCPT <rfc822;sparclinux-outgoing>);
+ Mon, 30 Aug 2004 20:41:39 -0400
+Original-Received: from smtp110.mail.sc5.yahoo.com ([66.163.170.8]:61347 "HELO
+ smtp110.mail.sc5.yahoo.com") by vger.kernel.org with SMTP
+ id S265847AbUHaAld (ORCPT <rfc822;sparclinux@vger.kernel.org>);
+ Mon, 30 Aug 2004 20:41:33 -0400
+Original-Received: from unknown (HELO cheetah.davemloft.net) (davem?330@63.197.226.105 with login)
+ by smtp110.mail.sc5.yahoo.com with SMTP; 31 Aug 2004 00:41:33 -0000
+Original-To: Richard Mortimer <richm@oldelvet.org.uk>,
+ marcelo.tosatti@cyclades.com
+In-Reply-To: <1093911340.2116.55.camel@duncow>
+X-Mailer: Sylpheed version 0.9.12 (GTK+ 1.2.10; sparc-unknown-linux-gnu)
+Precedence: bulk
+X-Mailing-List: sparclinux@vger.kernel.org
+Xref: main.gmane.org gmane.linux.ports.sparc:4049 gmane.linux.debian.ports.sparc:7148
+X-Report-Spam: http://spam.gmane.org/gmane.linux.ports.sparc:4049
+
+On Tue, 31 Aug 2004 01:15:40 +0100
+Richard Mortimer <richm@oldelvet.org.uk> wrote:
+
+> I'm seeing problems with lvm on sparc64. I have a reproducible test case
+> using snapshots where I can reliably reproduce an error similar to
+>
+> Trying to vfree() nonexistent vm area (0000000140072000)
+
+For once it's not sparc64's fault, it's a bug in the generic
+LVM ioctl handling :-)
+
+It saves both pointers, clobbers the userspace copy, then only
+restores one of the two pointers correctly. Easy to fix, see
+below.
+
+Marcelo, please apply, thanks.
+
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/08/30 17:24:05-07:00 davem@nuts.davemloft.net
+# [LVM]: Do not forget to restore both user pointers.
+#
+# This in particular can make compatability layers
+# crash, and it is a bug for regular applications
+# too.
+#
+# Signed-off-by: David S. Miller <davem@davemloft.net>
+#
+# drivers/md/lvm.c
+# 2004/08/30 17:23:48-07:00 davem@nuts.davemloft.net +12 -0
+# [LVM]: Do not forget to restore both user pointers.
+#
+# This in particular can make compatability layers
+# crash, and it is a bug for regular applications
+# too.
+#
+# Signed-off-by: David S. Miller <davem@davemloft.net>
+#
+diff -Nru a/drivers/md/lvm.c b/drivers/md/lvm.c
+--- a/drivers/md/lvm.c 2004-08-30 17:24:13 -07:00
++++ b/drivers/md/lvm.c 2004-08-30 17:24:13 -07:00
+@@ -2689,6 +2689,10 @@
+ (&lv_status_byname_req.lv->lv_current_pe,
+ &saved_ptr1, sizeof(void *)) != 0)
+ return -EFAULT;
++ if (copy_to_user
++ (&lv_status_byname_req.lv->lv_block_exception,
++ &saved_ptr2, sizeof(void *)) != 0)
++ return -EFAULT;
+ return 0;
+ }
+ }
+@@ -2743,6 +2747,10 @@
+ (&lv_status_byindex_req.lv->lv_current_pe, &saved_ptr1,
+ sizeof(void *)) != 0)
+ return -EFAULT;
++ if (copy_to_user
++ (&lv_status_byindex_req.lv->lv_block_exception, &saved_ptr2,
++ sizeof(void *)) != 0)
++ return -EFAULT;
+
+ return 0;
+ } /* lvm_do_lv_status_byindex() */
+@@ -2799,6 +2807,10 @@
+ /* Restore usermode pointers */
+ if (copy_to_user
+ (&lv_status_bydev_req.lv->lv_current_pe, &saved_ptr1,
++ sizeof(void *)) != 0)
++ return -EFAULT;
++ if (copy_to_user
++ (&lv_status_bydev_req.lv->lv_block_exception, &saved_ptr2,
+ sizeof(void *)) != 0)
+ return -EFAULT;
+
+-
+To unsubscribe from this list: send the line "unsubscribe sparclinux" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
+
Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-5
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-5 2004-09-01 00:01:40 UTC (rev 1500)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-5 2004-09-01 03:49:05 UTC (rev 1501)
@@ -3,3 +3,5 @@
+ 071_dep_fw_loader-2.diff
+ 072_6300esb_sata.diff
- 073_tg3_hw_autoneg.diff
++ 074_fealnx_ampersand.diff
++ 075_lvm_ioctl.diff