Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b04da8bf authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Linus Torvalds
Browse files

fnctl: f_modown should call write_lock_irqsave/restore 



Commit 70362511 exposed that f_modown()
should call write_lock_irqsave instead of just write_lock_irq so that
because a caller could have a spinlock held and it would not be good to
renable interrupts.

Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Tavis Ormandy <taviso@google.com>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9a3cbe32

fs/fcntl.c

+4 −2
Original line number Diff line number Diff line
@@ -199,7 +199,9 @@ static int setfl(int fd, struct file * filp, unsigned long arg) 
static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,

                     int force)

{

	write_lock_irq(&filp->f_owner.lock);

	unsigned long flags;



	write_lock_irqsave(&filp->f_owner.lock, flags);

	if (force || !filp->f_owner.pid) {

		put_pid(filp->f_owner.pid);

		filp->f_owner.pid = get_pid(pid);
@@ -211,7 +213,7 @@ static void f_modown(struct file *filp, struct pid *pid, enum pid_type type, 
			filp->f_owner.euid = cred->euid;

		}

	}

	write_unlock_irq(&filp->f_owner.lock);

	write_unlock_irqrestore(&filp->f_owner.lock, flags);

}



int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,