]> git.baikalelectronics.ru Git - kernel.git/commitdiff
fcntl: make F_GETOWN(EX) return 0 on dead owner task
authorPavel Tikhomirov <ptikhomirov@virtuozzo.com>
Wed, 3 Feb 2021 12:41:56 +0000 (15:41 +0300)
committerJeff Layton <jlayton@kernel.org>
Mon, 8 Feb 2021 12:36:13 +0000 (07:36 -0500)
Currently there is no way to differentiate the file with alive owner
from the file with dead owner but pid of the owner reused. That's why
CRIU can't actually know if it needs to restore file owner or not,
because if it restores owner but actual owner was dead, this can
introduce unexpected signals to the "false"-owner (which reused the
pid).

Let's change the api, so that F_GETOWN(EX) returns 0 in case actual
owner is dead already. This comports with the POSIX spec, which
states that a PID of 0 indicates that no signal will be sent.

Cc: Jeff Layton <jlayton@kernel.org>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: linux-fsdevel@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
fs/fcntl.c

index 05b36b28f2e87fbf303b6329e4a16ec23c7c9269..483ef8861376abb6aa22a0dd54ac0ea2a0a0da82 100644 (file)
@@ -148,11 +148,15 @@ void f_delown(struct file *filp)
 
 pid_t f_getown(struct file *filp)
 {
-       pid_t pid;
+       pid_t pid = 0;
        read_lock(&filp->f_owner.lock);
-       pid = pid_vnr(filp->f_owner.pid);
-       if (filp->f_owner.pid_type == PIDTYPE_PGID)
-               pid = -pid;
+       rcu_read_lock();
+       if (pid_task(filp->f_owner.pid, filp->f_owner.pid_type)) {
+               pid = pid_vnr(filp->f_owner.pid);
+               if (filp->f_owner.pid_type == PIDTYPE_PGID)
+                       pid = -pid;
+       }
+       rcu_read_unlock();
        read_unlock(&filp->f_owner.lock);
        return pid;
 }
@@ -200,11 +204,14 @@ static int f_setown_ex(struct file *filp, unsigned long arg)
 static int f_getown_ex(struct file *filp, unsigned long arg)
 {
        struct f_owner_ex __user *owner_p = (void __user *)arg;
-       struct f_owner_ex owner;
+       struct f_owner_ex owner = {};
        int ret = 0;
 
        read_lock(&filp->f_owner.lock);
-       owner.pid = pid_vnr(filp->f_owner.pid);
+       rcu_read_lock();
+       if (pid_task(filp->f_owner.pid, filp->f_owner.pid_type))
+               owner.pid = pid_vnr(filp->f_owner.pid);
+       rcu_read_unlock();
        switch (filp->f_owner.pid_type) {
        case PIDTYPE_PID:
                owner.type = F_OWNER_TID;