linux-kernel - Re: More kernel errors with overlay filesystem v22

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 29 May 2014 18:36:29 +0200
From:	Miklos Szeredi <miklos@...redi.hu>
To:	David Howells <dhowells@...hat.com>
Cc:	Al Viro <viro@...iv.linux.org.uk>,
	Linus Torvalds <torvalds@...ux-foundation.org>,
	Linux-Fsdevel <linux-fsdevel@...r.kernel.org>,
	Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Christoph Hellwig <hch@...radead.org>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Robo Bot <apw@...onical.com>, Felix Fietkau <nbd@...nwrt.org>,
	Neil Brown <neilb@...e.de>,
	Jordi Pujol <jordipujolp@...il.com>, ezk@....cs.sunysb.edu,
	Sedat Dilek <sedat.dilek@...il.com>,
	"J. R. Okajima" <hooanon05@...oo.co.jp>,
	"mszeredi@...e.cz" <mszeredi@...e.cz>
Subject: Re: More kernel errors with overlay filesystem v22

On Thu, May 29, 2014 at 05:23:22PM +0100, David Howells wrote:
> Miklos Szeredi <miklos@...redi.hu> wrote:
> 
> > Fixes pushed to overlayfs.v22 (and overlayfs.current).  Will
> > eventually fold these into the main overlayfs patch.
> 
> Okay... those are fixed.  Here's the next:
> 

generic_file_splice_write() uses I_MUTEX_CHILD.  Not sure why, though, parent
shouldn't be locked.  Maybe it's some remaining thing from the days when pipes
used the i_mutex on the pipe inode.  Probably should just remove that notation
and things will work.

Untested.

Thanks,
Miklos

diff --git a/fs/splice.c b/fs/splice.c
index fb1094bbe5af..3703c512c46e 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -1019,7 +1019,7 @@ generic_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
 		if (ret <= 0)
 			break;
 
-		mutex_lock_nested(&inode->i_mutex, I_MUTEX_CHILD);
+		mutex_lock(&inode->i_mutex);
 		ret = file_remove_suid(out);
 		if (!ret) {
 			ret = file_update_time(out);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/