From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org,
git-commits-head@vger.kernel.org
Cc: Justin Forbes <jmforbes@linuxtx.org>,
Zwane Mwaikambo <zwane@arm.linux.org.uk>,
"Theodore Ts'o" <tytso@mit.edu>,
Randy Dunlap <rdunlap@xenotime.net>,
Dave Jones <davej@redhat.com>,
Chuck Wolber <chuckw@quantumlinux.com>,
torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk,
Jan Kara <jack@suse.cz>,
reiserfs-dev@namesys.com, Greg Kroah-Hartman <gregkh@suse.de>
Subject: [patch 15/24] Fix reiserfs deadlock
Date: Thu, 27 Apr 2006 17:20:39 -0700 [thread overview]
Message-ID: <20060428002039.GP18750@kroah.com> (raw)
In-Reply-To: <20060428001557.GA18750@kroah.com>
[-- Attachment #1: fix-reiserfs-deadlock.patch --]
[-- Type: text/plain, Size: 1315 bytes --]
-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jan Kara <jack@suse.cz>
[PATCH] Fix reiserfs deadlock
reiserfs_cache_default_acl() should return whether we successfully found
the acl or not. We have to return correct value even if reiserfs_get_acl()
returns error code and not just 0. Otherwise callers such as
reiserfs_mkdir() can unnecessarily lock the xattrs and later functions such
as reiserfs_new_inode() fail to notice that we have already taken the lock
and try to take it again with obvious consequences.
Signed-off-by: Jan Kara <jack@suse.cz>
Cc: <reiserfs-dev@namesys.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
fs/reiserfs/xattr_acl.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- linux-2.6.16.11.orig/fs/reiserfs/xattr_acl.c
+++ linux-2.6.16.11/fs/reiserfs/xattr_acl.c
@@ -408,8 +408,9 @@ int reiserfs_cache_default_acl(struct in
acl = reiserfs_get_acl(inode, ACL_TYPE_DEFAULT);
reiserfs_read_unlock_xattrs(inode->i_sb);
reiserfs_read_unlock_xattr_i(inode);
- ret = acl ? 1 : 0;
- posix_acl_release(acl);
+ ret = (acl && !IS_ERR(acl));
+ if (ret)
+ posix_acl_release(acl);
}
return ret;
--
next prev parent reply other threads:[~2006-04-28 0:22 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20060428001226.204293000@quad.kroah.org>
2006-04-28 0:15 ` [patch 00/24] -stable review Greg KH
2006-04-28 0:16 ` [patch 01/24] sonypi: correct detection of new ICH7-based laptops Greg KH
2006-04-28 0:16 ` [patch 02/24] cs5535_gpio.c: call cdev_del() during module_exit to unmap kobject references and other cleanups Greg KH
2006-04-28 0:16 ` [patch 03/24] make vm86 call audit_syscall_exit Greg KH
2006-04-29 16:34 ` Sergey Vlasov
2006-05-01 17:54 ` Jason Baron
2006-04-28 0:17 ` [patch 04/24] x86_64: Pass -32 to the assembler when compiling the 32bit vsyscall pages Greg KH
2006-04-28 0:17 ` [patch 05/24] x86_64: Fix a race in the free_iommu path Greg KH
2006-04-28 0:18 ` [patch 06/24] USB: fix array overrun in drivers/usb/serial/option.c Greg KH
2006-04-28 0:18 ` [patch 07/24] tipar oops fix Greg KH
2006-04-28 0:18 ` [patch 08/24] get_dvb_firmware: download nxt2002 firmware from new driver location Greg KH
2006-04-28 0:18 ` [patch 09/24] for_each_possible_cpu Greg KH
2006-04-28 0:18 ` [patch 10/24] fix saa7129 support in saa7127 module for pvr350 tv out Greg KH
2006-04-28 0:19 ` [patch 11/24] cxusb-bluebird: bug-fix: power down corrupts frontend Greg KH
2006-04-28 0:19 ` [patch 12/24] dm snapshot: fix kcopyd destructor Greg KH
2006-04-28 0:19 ` [patch 13/24] dm flush queue EINTR Greg KH
2006-04-28 0:20 ` [patch 14/24] Simplify proc/devices and fix early termination regression Greg KH
2006-04-28 0:20 ` Greg KH [this message]
2006-04-28 0:21 ` [patch 16/24] Altix snsc: duplicate kobject fix Greg KH
2006-04-28 0:21 ` [patch 17/24] Alpha: strncpy() fix Greg KH
2006-04-28 0:21 ` [patch 18/24] LSM: add missing hook to do_compat_readv_writev() Greg KH
2006-04-28 0:22 ` [patch 19/24] x86/PAE: Fix pte_clear for the >4GB RAM case Greg KH
2006-04-28 0:22 ` [patch 20/24] NET: e1000: Update truesize with the length of the packet for packet split Greg KH
2006-04-28 0:22 ` [patch 21/24] MIPS: Use "R" constraint for cache_op Greg KH
2006-04-28 0:23 ` [patch 22/24] MIPS: R2 build fixes for gcc < 3.4 Greg KH
2006-04-28 0:23 ` [patch 23/24] MIPS: Fix tx49_blast_icache32_page_indexed Greg KH
2006-04-28 0:24 ` [patch 24/24] MIPS: Fix branch emulation for floating-point exceptions Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060428002039.GP18750@kroah.com \
--to=gregkh@suse.de \
--cc=akpm@osdl.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=chuckw@quantumlinux.com \
--cc=davej@redhat.com \
--cc=git-commits-head@vger.kernel.org \
--cc=jack@suse.cz \
--cc=jmforbes@linuxtx.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rdunlap@xenotime.net \
--cc=reiserfs-dev@namesys.com \
--cc=stable@kernel.org \
--cc=torvalds@osdl.org \
--cc=tytso@mit.edu \
--cc=zwane@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox