Skip to contentSkip to conversation

linux-user: Drop unnecessary check in signalfd4 syscall

PATCH In review Helge Deller 2 participants 5 messages Apr 24, 2020 – Apr 25, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 linux-user: Drop unnecessary check in signalfd4 syscall

The signalfd4() syscall takes optional O_NONBLOCK and O_CLOEXEC fcntl flags. If the user gave any other invalid flags, the host syscall will return correct error codes, so simply drop the extra check here.

linux-user/syscall.c +0 -3
index 05f03919ff..ebf0d38321 100644
@@ -7176,9 +7176,6 @@ static abi_long do_signalfd4(int fd, abi_long mask, int flags)
     sigset_t host_mask;
     abi_long ret;
 
-    if (flags & ~(TARGET_O_NONBLOCK | TARGET_O_CLOEXEC)) {
-        return -TARGET_EINVAL;
-    }
     if (!lock_user_struct(VERIFY_READ, target_mask, mask, 1)) {
         return -TARGET_EFAULT;
     }
#1 lore raw

Le 24/04/2020 à 23:04, Helge Deller a écrit :

Quoted 12 lines

The signalfd4() syscall takes optional O_NONBLOCK and O_CLOEXEC fcntl flags. If the user gave any other invalid flags, the host syscall will return correct error codes, so simply drop the extra check here.

linux-user/syscall.c +0 -0
index 05f03919ff..ebf0d38321 100644

linux-user/syscall.c static abi_long do_signalfd4(int fd, abi_long mask, int flags) · line 7181

Quoted 9 lines
linux-user/syscall.c +0 -3
@@ -7176,9 +7176,6 @@ static abi_long do_signalfd4(int fd, abi_long mask, int flags)
     sigset_t host_mask;
     abi_long ret;
 
-    if (flags & ~(TARGET_O_NONBLOCK | TARGET_O_CLOEXEC)) {
-        return -TARGET_EINVAL;
-    }
     if (!lock_user_struct(VERIFY_READ, target_mask, mask, 1)) {
         return -TARGET_EFAULT;
     }

Perhaps we want to trigger the TARGET_EINVAL before the TARGET_EFAULT if we have both cases?

But I've checked the kernel, and the kernel does a copy_from_user() before checking the flags, but it returns EINVAL rather than EFAULT.

We can remove the flags checking but we should also change TARGET_EFAULT by TARGET_EINVAL.

Thanks,
Laurent

#2 lore raw
Quoted 26 lines · Laurent Vivier

Le 24/04/2020 à 23:04, Helge Deller a écrit :

Quoted 12 lines

The signalfd4() syscall takes optional O_NONBLOCK and O_CLOEXEC fcntl flags. If the user gave any other invalid flags, the host syscall will return correct error codes, so simply drop the extra check here.

linux-user/syscall.c +0 -0
index 05f03919ff..ebf0d38321 100644

linux-user/syscall.c static abi_long do_signalfd4(int fd, abi_long mask, int flags) · line 7181

Quoted 9 lines
linux-user/syscall.c +0 -3
@@ -7176,9 +7176,6 @@ static abi_long do_signalfd4(int fd, abi_long mask, int flags)
     sigset_t host_mask;
     abi_long ret;
 
-    if (flags & ~(TARGET_O_NONBLOCK | TARGET_O_CLOEXEC)) {
-        return -TARGET_EINVAL;
-    }
     if (!lock_user_struct(VERIFY_READ, target_mask, mask, 1)) {
         return -TARGET_EFAULT;
     }

Perhaps we want to trigger the TARGET_EINVAL before the TARGET_EFAULT if we have both cases?

Quoted 2 lines

But I've checked the kernel, and the kernel does a copy_from_user() before checking the flags, but it returns EINVAL rather than EFAULT.

That's not the full picture, since the kernel is not consistent here! In the compat-case (32bit userspace on 64bit kernel) it returns correctly EINVAL and EFAULT:

        if (sigsetsize != sizeof(compat_sigset_t))
                return -EINVAL;
        if (get_compat_sigset(&mask, user_mask))
                return -EFAULT;
while in the non-compat case it returns EINVAL only:
        if (sizemask != sizeof(sigset_t) ||
            copy_from_user(&mask, user_mask, sizeof(mask)))
                return -EINVAL;

I think the kernel should be fixed here...

Quoted 2 lines

We can remove the flags checking but we should also change TARGET_EFAULT by TARGET_EINVAL.

According to the different behaviour of the kernel mentioned above you won't get it correct either way.

Helge

#3 lore raw

Le 25/04/2020 à 11:24, Helge Deller a écrit :

Quoted 42 lines · Laurent Vivier
Quoted 26 lines

Le 24/04/2020 à 23:04, Helge Deller a écrit :

Quoted 12 lines

The signalfd4() syscall takes optional O_NONBLOCK and O_CLOEXEC fcntl flags. If the user gave any other invalid flags, the host syscall will return correct error codes, so simply drop the extra check here.

linux-user/syscall.c +0 -0
index 05f03919ff..ebf0d38321 100644

linux-user/syscall.c static abi_long do_signalfd4(int fd, abi_long mask, int flags) · line 7181

Quoted 9 lines
linux-user/syscall.c +0 -3
@@ -7176,9 +7176,6 @@ static abi_long do_signalfd4(int fd, abi_long mask, int flags)
     sigset_t host_mask;
     abi_long ret;
 
-    if (flags & ~(TARGET_O_NONBLOCK | TARGET_O_CLOEXEC)) {
-        return -TARGET_EINVAL;
-    }
     if (!lock_user_struct(VERIFY_READ, target_mask, mask, 1)) {
         return -TARGET_EFAULT;
     }

Perhaps we want to trigger the TARGET_EINVAL before the TARGET_EFAULT if we have both cases?

Quoted 2 lines

But I've checked the kernel, and the kernel does a copy_from_user() before checking the flags, but it returns EINVAL rather than EFAULT.

That's not the full picture, since the kernel is not consistent here! In the compat-case (32bit userspace on 64bit kernel) it returns correctly EINVAL and EFAULT:

        if (sigsetsize != sizeof(compat_sigset_t))
                return -EINVAL;
        if (get_compat_sigset(&mask, user_mask))
                return -EFAULT;
while in the non-compat case it returns EINVAL only:
        if (sizemask != sizeof(sigset_t) ||
            copy_from_user(&mask, user_mask, sizeof(mask)))
                return -EINVAL;
Quoted 7 lines

I think the kernel should be fixed here...

Quoted 2 lines

We can remove the flags checking but we should also change TARGET_EFAULT by TARGET_EINVAL.

According to the different behaviour of the kernel mentioned above you won't get it correct either way.

If we refer to manpage, EFAULT is not one of possible errors.

Thanks,
Laurent

#4 lore raw
Quoted 45 lines · Laurent Vivier

Le 25/04/2020 à 11:24, Helge Deller a écrit :

Quoted 44 lines · Laurent Vivier
Quoted 26 lines

Le 24/04/2020 à 23:04, Helge Deller a écrit :

Quoted 12 lines

The signalfd4() syscall takes optional O_NONBLOCK and O_CLOEXEC fcntl flags. If the user gave any other invalid flags, the host syscall will return correct error codes, so simply drop the extra check here.

linux-user/syscall.c +0 -0
index 05f03919ff..ebf0d38321 100644

linux-user/syscall.c static abi_long do_signalfd4(int fd, abi_long mask, int flags) · line 7181

Quoted 9 lines
linux-user/syscall.c +0 -3
@@ -7176,9 +7176,6 @@ static abi_long do_signalfd4(int fd, abi_long mask, int flags)
     sigset_t host_mask;
     abi_long ret;
 
-    if (flags & ~(TARGET_O_NONBLOCK | TARGET_O_CLOEXEC)) {
-        return -TARGET_EINVAL;
-    }
     if (!lock_user_struct(VERIFY_READ, target_mask, mask, 1)) {
         return -TARGET_EFAULT;
     }

Perhaps we want to trigger the TARGET_EINVAL before the TARGET_EFAULT if we have both cases?

Quoted 2 lines

But I've checked the kernel, and the kernel does a copy_from_user() before checking the flags, but it returns EINVAL rather than EFAULT.

That's not the full picture, since the kernel is not consistent here! In the compat-case (32bit userspace on 64bit kernel) it returns correctly EINVAL and EFAULT:

        if (sigsetsize != sizeof(compat_sigset_t))
                return -EINVAL;
        if (get_compat_sigset(&mask, user_mask))
                return -EFAULT;
while in the non-compat case it returns EINVAL only:
        if (sizemask != sizeof(sigset_t) ||
            copy_from_user(&mask, user_mask, sizeof(mask)))
                return -EINVAL;

I think the kernel should be fixed here...

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

We can remove the flags checking but we should also change TARGET_EFAULT by TARGET_EINVAL.

According to the different behaviour of the kernel mentioned above you won't get it correct either way.

If we refer to manpage, EFAULT is not one of possible errors.

The manpage doesn't mention any error code for a bad mask address, and IMHO the manpage should reflect the real coding, not vice versa. I've just sent a RFC patch to the kernel mailing list.
It's not a critical problem, but it would be nice to be at least consistent across the implementations. Either both should return always EINVAL, or both should return EFAULT. If it gets accepted I'll send a patch to correct the manpage accordingly afterwards, and then we can adjust qemu.

Helge