rpms/kernel/F-7 linux-2.6-sysfs-inode-allocator-oops.patch, NONE, 1.1 kernel-2.6.spec, 1.3183, 1.3184
Dave Jones (davej)
fedora-extras-commits at redhat.com
Tue May 22 04:05:55 UTC 2007
Author: davej
Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16086
Modified Files:
kernel-2.6.spec
Added Files:
linux-2.6-sysfs-inode-allocator-oops.patch
Log Message:
* Tue May 22 2007 Dave Jones <davej at redhat.com>
- fix oops in sysfs_readdir.
linux-2.6-sysfs-inode-allocator-oops.patch:
--- NEW FILE linux-2.6-sysfs-inode-allocator-oops.patch ---
>From davej Mon May 21 15:08:08 2007
Return-path: <linux-kernel-owner+davej=40kernelslacker.org-S1764269AbXEUTES at vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.1.8 (2007-02-13) on
gelk.kernelslacker.org
X-Spam-Level:
X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham
version=3.1.8
Envelope-to: davej at kernelslacker.org
Delivery-date: Mon, 21 May 2007 20:04:31 +0100
Received: from testure.choralone.org [194.9.77.134]
by gelk.kernelslacker.org with IMAP (fetchmail-6.3.6)
for <davej at localhost> (single-drop); Mon, 21 May 2007 15:08:08 -0400 (EDT)
Received: from vger.kernel.org ([209.132.176.167])
by testure.choralone.org with esmtp (Exim 4.63)
(envelope-from <linux-kernel-owner+davej=40kernelslacker.org-S1764269AbXEUTES at vger.kernel.org>)
id 1HqDBG-0005jI-Tn
for davej at kernelslacker.org; Mon, 21 May 2007 20:04:31 +0100
Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
id S1764269AbXEUTES (ORCPT <rfc822;davej at kernelslacker.org>);
Mon, 21 May 2007 15:04:18 -0400
Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1756769AbXEUTED
(ORCPT <rfc822;linux-kernel-outgoing>);
Mon, 21 May 2007 15:04:03 -0400
Received: from mx1.redhat.com ([66.187.233.31]:34360 "EHLO mx1.redhat.com"
rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
id S1756759AbXEUTEA (ORCPT <rfc822;linux-kernel at vger.kernel.org>);
Mon, 21 May 2007 15:04:00 -0400
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
by mx1.redhat.com (8.13.1/8.13.1) with ESMTP id l4LJ2jKD024422;
Mon, 21 May 2007 15:02:45 -0400
Received: from pobox-2.corp.redhat.com (pobox-2.corp.redhat.com [10.11.255.15])
by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id l4LJ2jrr005611;
Mon, 21 May 2007 15:02:45 -0400
Received: from [10.15.80.10] (neon.msp.redhat.com [10.15.80.10])
by pobox-2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id l4LJ2ig9005229;
Mon, 21 May 2007 15:02:44 -0400
Message-ID: <4651ECD3.3060703 at redhat.com>
Date: Mon, 21 May 2007 14:02:43 -0500
From: Eric Sandeen <sandeen at redhat.com>
User-Agent: Thunderbird 1.5.0.10 (X11/20070302)
MIME-Version: 1.0
To: Eric Sandeen <sandeen at redhat.com>
CC: Linux Kernel Mailing List <linux-kernel at vger.kernel.org>,
Tejun Heo <htejun at gmail.com>,
Maneesh Soni <maneesh at in.ibm.com>, stable at kernel.org
Subject: Re: [stable] [PATCH] - fix oops in sysfs_readdir
References: <4651E0C9.3080609 at redhat.com>
In-Reply-To: <4651E0C9.3080609 at redhat.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner at vger.kernel.org
Precedence: bulk
X-Mailing-List: linux-kernel at vger.kernel.org
Status: RO
Content-Length: 3548
Lines: 108
Eric Sandeen wrote:
> This is a non-ida backport of Tejun's patch in -mm at:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.22-rc1/2.6.22-rc1-mm1/broken-out/gregkh-driver-sysfs-allocate-inode-number-using-ida.patch
> for the 2.6.16 -stable tree - it follows the same scheme of using s_ino to safely
> store & retrieve the inode number of sysfs entries for use in sysfs_readdir,
> but uses a brain-dead-simple inode nr allocator rather than ida, which would
> bring along a lot of newer, more complex code.
>
> No, this doesn't guarantee uniqueness of sysfs inode numbers, but then
> the code in -stable today doesn't either - and with this change, at least
> it shouldn't oops.
>
> Comments?
>
> Thanks,
>
> -Eric
Here's one that works w/2.6.21... the global should probably be an atomic
or lock-protected, I suppose, but again, if we don't guarantee uniqueness
anyway...?
Signed-off-by: Eric Sandeen <sandeen at redhat.com>
Index: linux-2.6.21/fs/sysfs/dir.c
===================================================================
--- linux-2.6.21.orig/fs/sysfs/dir.c
+++ linux-2.6.21/fs/sysfs/dir.c
@@ -32,6 +32,14 @@ static struct dentry_operations sysfs_de
.d_iput = sysfs_d_iput,
};
+static unsigned int sysfs_inode_counter;
+ino_t sysfs_get_inum(void)
+{
+ if (unlikely(sysfs_inode_counter < 3))
+ sysfs_inode_counter = 3;
+ return sysfs_inode_counter++;
+}
+
/*
* Allocates a new sysfs_dirent and links it to the parent sysfs_dirent
*/
@@ -511,7 +519,7 @@ static int sysfs_readdir(struct file * f
switch (i) {
case 0:
- ino = dentry->d_inode->i_ino;
+ ino = parent_sd->s_ino;
if (filldir(dirent, ".", 1, i, ino, DT_DIR) < 0)
break;
filp->f_pos++;
@@ -540,10 +548,7 @@ static int sysfs_readdir(struct file * f
name = sysfs_get_name(next);
len = strlen(name);
- if (next->s_dentry)
- ino = next->s_dentry->d_inode->i_ino;
- else
- ino = iunique(sysfs_sb, 2);
+ ino = next->s_ino;
if (filldir(dirent, name, len, filp->f_pos, ino,
dt_type(next)) < 0)
Index: linux-2.6.21/fs/sysfs/inode.c
===================================================================
--- linux-2.6.21.orig/fs/sysfs/inode.c
+++ linux-2.6.21/fs/sysfs/inode.c
@@ -140,6 +140,7 @@ struct inode * sysfs_new_inode(mode_t mo
inode->i_mapping->a_ops = &sysfs_aops;
inode->i_mapping->backing_dev_info = &sysfs_backing_dev_info;
inode->i_op = &sysfs_inode_operations;
+ inode->i_ino = sd->s_ino;
lockdep_set_class(&inode->i_mutex, &sysfs_inode_imutex_key);
if (sd->s_iattr) {
Index: linux-2.6.21/fs/sysfs/mount.c
===================================================================
--- linux-2.6.21.orig/fs/sysfs/mount.c
+++ linux-2.6.21/fs/sysfs/mount.c
@@ -33,6 +33,7 @@ static struct sysfs_dirent sysfs_root =
.s_element = NULL,
.s_type = SYSFS_ROOT,
.s_iattr = NULL,
+ .s_ino = 1,
};
static void sysfs_clear_inode(struct inode *inode)
Index: linux-2.6.21/fs/sysfs/sysfs.h
===================================================================
--- linux-2.6.21.orig/fs/sysfs/sysfs.h
+++ linux-2.6.21/fs/sysfs/sysfs.h
@@ -5,6 +5,7 @@ struct sysfs_dirent {
void * s_element;
int s_type;
umode_t s_mode;
+ ino_t s_ino;
struct dentry * s_dentry;
struct iattr * s_iattr;
atomic_t s_event;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3183
retrieving revision 1.3184
diff -u -r1.3183 -r1.3184
--- kernel-2.6.spec 22 May 2007 04:00:24 -0000 1.3183
+++ kernel-2.6.spec 22 May 2007 04:05:19 -0000 1.3184
@@ -573,6 +573,7 @@
Patch1640: linux-2.6-module-override-modparam-cmdline.patch
Patch1650: linux-2.6-serial-460800.patch
Patch1660: linux-2.6-mm-udf-fixes.patch
+Patch1670: linux-2.6-sysfs-inode-allocator-oops.patch
Patch1681: linux-2.6-xfs-umount-fix.patch
Patch1690: linux-2.6-PT_LOAD-align.patch
Patch1700: linux-2.6-dvb-spinlock.patch
@@ -1319,6 +1320,8 @@
%patch1650 -p1
# Allow large files on UDF
#%patch1660 -p1
+# fix oops in sysfs_readdir
+%patch1670 -p1
# Fix XFS umount bug.
%patch1681 -p1
# Align kernel data segment to page boundary.
@@ -2408,6 +2411,9 @@
%changelog
* Tue May 22 2007 Dave Jones <davej at redhat.com>
+- fix oops in sysfs_readdir.
+
+* Tue May 22 2007 Dave Jones <davej at redhat.com>
- Make freezable workqueues singlethreaded.
* Mon May 21 2007 Dave Jones <davej at redhat.com>
More information about the fedora-extras-commits
mailing list