From: Eric W. Biederman <ebiederm@xmission.com>
Date: Mon, 2 Oct 2006 09:17:27 +0000 (-0700)
Subject: [PATCH] file: Add locking to f_getown
X-Git-Tag: v2.6.19-rc1~463
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=43fa1adb9334bf4585cd53144eb5911488f85bc7;p=linux-2.6-omap-h63xx.git

[PATCH] file: Add locking to f_getown

This has been needed for a long time, but now with the advent of a
reference counted struct pid there are real consequences for getting this
wrong.

Someone I think it was Oleg Nesterov pointed out that this construct was
missing locking, when I introduced struct pid.  After taking time to review
the locking construct already present I figured out which lock needs to be
taken.  The other paths that access f_owner.pid take either the f_owner
read or the write lock.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/fs/fcntl.c b/fs/fcntl.c
index e7c66a1bf83..e4f26165f12 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -305,9 +305,11 @@ void f_delown(struct file *filp)
 pid_t f_getown(struct file *filp)
 {
 	pid_t pid;
+	read_lock(&filp->f_owner.lock);
 	pid = pid_nr(filp->f_owner.pid);
 	if (filp->f_owner.pid_type == PIDTYPE_PGID)
 		pid = -pid;
+	read_unlock(&filp->f_owner.lock);
 	return pid;
 }