posix: Fix access checks in select
PATCH 1/1 posix: Fix access checks in select
[ Please pull from git://git.xenomai.org/xenomai-jki.git for-2.4.x ]
The test for __xn_access_ok was inverted, thus rejected valid requests. Fix this and refactor the code in order to check for the actual size of the passed fd sets.
---
ksrc/skins/posix/syscall.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-)
ksrc/skins/posix/syscall.c +9 -12
@@ -2384,17 +2384,16 @@ static int __select(struct task_struct *curr, struct pt_regs *regs)struct timeval tv;pthread_t thread;int i, err, nfds; +size_t fds_size; thread =pse51_current_thread ();if (!thread)return -EPERM ;if (__xn_reg_arg5 (regs)) { -if (__xn_access_ok (curr,VERIFY_WRITE , -__xn_reg_arg5 (regs),sizeof (tv))) -return -EFAULT ; - -if (__xn_copy_from_user (curr, &tv, +if (!__xn_access_ok (curr,VERIFY_WRITE , +__xn_reg_arg5 (regs),sizeof (tv)) || +__xn_copy_from_user (curr, &tv, (void __user *)__xn_reg_arg5 (regs),sizeof (tv)))return -EFAULT ;
@@ -2407,19 +2406,17 @@ static int __select(struct task_struct *curr, struct pt_regs *regs) } nfds =__xn_reg_arg1 (regs); + fds_size =__FDELT (nfds + __NFDBITS -1 ) *sizeof (long );for (i =0 ; i <XNSELECT_MAX_TYPES ; i++)if (ufd_sets[i]) { in_fds[i] = &in_fds_storage[i]; out_fds[i] = & out_fds_storage[i]; -if (__xn_access_ok (curr,VERIFY_WRITE , - ufd_sets[i],sizeof (fd_set))) -return -EFAULT ; - -if (__xn_copy_from_user (curr, in_fds[i], +if (!__xn_access_ok (curr,VERIFY_WRITE , + ufd_sets[i], fds_size) || +__xn_copy_from_user (curr, in_fds[i], (void __user *) ufd_sets[i], -__FDELT (nfds + __NFDBITS -1 ) - *sizeof (long ))) + fds_size))return -EFAULT ; }
Quoted 28 lines · Jan Kiszka
[ Please pull from
git://git.xenomai.org/xenomai-jki.gitfor-2.4.x ]The test for
__xn_access_okwas inverted, thus rejected valid requests. Fix this and refactor the code in order to check for the actual size of the passed fd sets.Signed-off-by Jan Kiszka <[email protected]>---
ksrc/skins/posix/syscall.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-)ksrc/skins/posix/syscall.c +1
-1@@ -2384,17 +2384,16 @@ static int __select(struct task_struct *curr, struct pt_regs *regs)struct timeval tv;pthread_t thread;int i, err, nfds; +size_t fds_size; thread =pse51_current_thread ();if (!thread)return -EPERM ;if (__xn_reg_arg5 (regs)) { - if (__xn_access_ok(curr, VERIFY_WRITE,
ksrc/skins/posix/syscall.c static int __select(struct task_struct *curr, struct pt_regs *regs) · line 2399
Quoted 10 lines
ksrc/skins/posix/syscall.c +3
-4- __xn_reg_arg5(regs), sizeof(tv))) -return -EFAULT ; - -if (__xn_copy_from_user (curr, &tv, +if (!__xn_access_ok (curr,VERIFY_WRITE , +__xn_reg_arg5 (regs),sizeof (tv)) || +__xn_copy_from_user (curr, &tv, (void __user *)__xn_reg_arg5 (regs),sizeof (tv)))return -EFAULT ;
Ok.
Quoted 7 lines
ksrc/skins/posix/syscall.c +1
-0@@ -2407,19 +2406,17 @@ static int __select(struct task_struct *curr, struct pt_regs *regs) } nfds =__xn_reg_arg1 (regs); + fds_size =__FDELT (nfds + __NFDBITS -1 ) *sizeof (long );for (i =0 ; i <XNSELECT_MAX_TYPES ; i++)
ksrc/skins/posix/syscall.c static int __select(struct task_struct *curr, struct pt_regs *regs) · line 2416
Quoted 10 lines
ksrc/skins/posix/syscall.c +2
-5if (ufd_sets[i]) { in_fds[i] = &in_fds_storage[i]; out_fds[i] = & out_fds_storage[i]; -if (__xn_access_ok (curr,VERIFY_WRITE , - ufd_sets[i],sizeof (fd_set))) -return -EFAULT ; - - if (__xn_copy_from_user(curr, in_fds[i], + if (!__xn_access_ok(curr, VERIFY_WRITE, + ufd_sets[i], fds_size) ||
I do not think this is a good idea. There is no special mention to it in select specification, but at least select prototype suggests that the user-space structure should be a valid fd_set, not a partial subset of it.
Quoted 9 lines
ksrc/skins/posix/syscall.c +2
-2+__xn_copy_from_user (curr, in_fds[i], (void __user *) ufd_sets[i], - __FDELT(nfds + __NFDBITS - 1) - * sizeof(long))) + fds_size)) return -EFAULT; }
Signature · 1 line
Gilles.
Quoted 48 lines · Gilles Chanteperdrix
Quoted 28 lines · Jan Kiszka
[ Please pull from
git://git.xenomai.org/xenomai-jki.gitfor-2.4.x ]The test for
__xn_access_okwas inverted, thus rejected valid requests. Fix this and refactor the code in order to check for the actual size of the passed fd sets.Signed-off-by Jan Kiszka <[email protected]>---
ksrc/skins/posix/syscall.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-)ksrc/skins/posix/syscall.c +1
-1@@ -2384,17 +2384,16 @@ static int __select(struct task_struct *curr, struct pt_regs *regs)struct timeval tv;pthread_t thread;int i, err, nfds; +size_t fds_size; thread =pse51_current_thread ();if (!thread)return -EPERM ;if (__xn_reg_arg5 (regs)) { - if (__xn_access_ok(curr, VERIFY_WRITE,ksrc/skins/posix/syscall.c static int __select(struct task_struct *curr, struct pt_regs *regs) · line 2399
Quoted 10 lines
ksrc/skins/posix/syscall.c +3
-4- __xn_reg_arg5(regs), sizeof(tv))) -return -EFAULT ; - -if (__xn_copy_from_user (curr, &tv, +if (!__xn_access_ok (curr,VERIFY_WRITE , +__xn_reg_arg5 (regs),sizeof (tv)) || +__xn_copy_from_user (curr, &tv, (void __user *)__xn_reg_arg5 (regs),sizeof (tv)))return -EFAULT ;Ok.
Quoted 6 lines
ksrc/skins/posix/syscall.c +1
-0@@ -2407,19 +2406,17 @@ static int __select(struct task_struct *curr, struct pt_regs *regs) } nfds =__xn_reg_arg1 (regs); + fds_size =__FDELT (nfds + __NFDBITS -1 ) *sizeof (long );
Quoted 15 lines
ksrc/skins/posix/syscall.c static int __select(struct task_struct *curr, struct pt_regs *regs) · line 2416
Quoted 11 lines
ksrc/skins/posix/syscall.c +2
-5for (i =0 ; i <XNSELECT_MAX_TYPES ; i++)if (ufd_sets[i]) { in_fds[i] = &in_fds_storage[i]; out_fds[i] = & out_fds_storage[i]; -if (__xn_access_ok (curr,VERIFY_WRITE , - ufd_sets[i],sizeof (fd_set))) -return -EFAULT ; - - if (__xn_copy_from_user(curr, in_fds[i], + if (!__xn_access_ok(curr, VERIFY_WRITE, + ufd_sets[i], fds_size) ||I do not think this is a good idea. There is no special mention to it in select specification, but at least select prototype suggests that the user-space structure should be a valid
fd_set, not a partial subset of it.
Yeah, and we copy a full set back. Missed that, will update both patches.
Jan
Quoted 63 lines · Jan Kiszka
Quoted 47 lines · Gilles Chanteperdrix
Quoted 28 lines · Jan Kiszka
[ Please pull from
git://git.xenomai.org/xenomai-jki.gitfor-2.4.x ]The test for
__xn_access_okwas inverted, thus rejected valid requests. Fix this and refactor the code in order to check for the actual size of the passed fd sets.Signed-off-by Jan Kiszka <[email protected]>---
ksrc/skins/posix/syscall.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-)ksrc/skins/posix/syscall.c +1
-1@@ -2384,17 +2384,16 @@ static int __select(struct task_struct *curr, struct pt_regs *regs)struct timeval tv;pthread_t thread;int i, err, nfds; +size_t fds_size; thread =pse51_current_thread ();if (!thread)return -EPERM ;if (__xn_reg_arg5 (regs)) { - if (__xn_access_ok(curr, VERIFY_WRITE,ksrc/skins/posix/syscall.c static int __select(struct task_struct *curr, struct pt_regs *regs) · line 2399
Quoted 10 lines
ksrc/skins/posix/syscall.c +3
-4- __xn_reg_arg5(regs), sizeof(tv))) -return -EFAULT ; - -if (__xn_copy_from_user (curr, &tv, +if (!__xn_access_ok (curr,VERIFY_WRITE , +__xn_reg_arg5 (regs),sizeof (tv)) || +__xn_copy_from_user (curr, &tv, (void __user *)__xn_reg_arg5 (regs),sizeof (tv)))return -EFAULT ;Ok.
Quoted 6 lines
ksrc/skins/posix/syscall.c +1
-0@@ -2407,19 +2406,17 @@ static int __select(struct task_struct *curr, struct pt_regs *regs) } nfds =__xn_reg_arg1 (regs); + fds_size =__FDELT (nfds + __NFDBITS -1 ) *sizeof (long );Quoted 14 lines
ksrc/skins/posix/syscall.c static int __select(struct task_struct *curr, struct pt_regs *regs) · line 2416
Quoted 11 lines
ksrc/skins/posix/syscall.c +2
-5for (i =0 ; i <XNSELECT_MAX_TYPES ; i++)if (ufd_sets[i]) { in_fds[i] = &in_fds_storage[i]; out_fds[i] = & out_fds_storage[i]; -if (__xn_access_ok (curr,VERIFY_WRITE , - ufd_sets[i],sizeof (fd_set))) -return -EFAULT ; - - if (__xn_copy_from_user(curr, in_fds[i], + if (!__xn_access_ok(curr, VERIFY_WRITE, + ufd_sets[i], fds_size) ||I do not think this is a good idea. There is no special mention to it in select specification, but at least select prototype suggests that the user-space structure should be a valid
fd_set, not a partial subset of it.
Quoted 1 line
Yeah, and we copy a full set back. Missed that, will update both patches.
This (and the corresponding head patch) is now available via git:
---------->
The test for __xn_access_ok was inverted, thus rejected valid requests. Fix this and refactor the code in order to check for the actual size of the passed fd sets.
---
ksrc/skins/posix/syscall.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-)
ksrc/skins/posix/syscall.c +9 -12
@@ -2384,17 +2384,16 @@ static int __select(struct task_struct *curr, struct pt_regs *regs)struct timeval tv;pthread_t thread;int i, err, nfds; +size_t fds_size; thread =pse51_current_thread ();if (!thread)return -EPERM ;if (__xn_reg_arg5 (regs)) { -if (__xn_access_ok (curr,VERIFY_WRITE , -__xn_reg_arg5 (regs),sizeof (tv))) -return -EFAULT ; - -if (__xn_copy_from_user (curr, &tv, +if (!__xn_access_ok (curr,VERIFY_WRITE , +__xn_reg_arg5 (regs),sizeof (tv)) || +__xn_copy_from_user (curr, &tv, (void __user *)__xn_reg_arg5 (regs),sizeof (tv)))return -EFAULT ;
@@ -2407,19 +2406,17 @@ static int __select(struct task_struct *curr, struct pt_regs *regs) } nfds =__xn_reg_arg1 (regs); + fds_size =__FDELT (nfds + __NFDBITS -1 ) *sizeof (long );for (i =0 ; i <XNSELECT_MAX_TYPES ; i++)if (ufd_sets[i]) { in_fds[i] = &in_fds_storage[i]; out_fds[i] = & out_fds_storage[i]; -if (__xn_access_ok (curr,VERIFY_WRITE , - ufd_sets[i],sizeof (fd_set))) -return -EFAULT ; - -if (__xn_copy_from_user (curr, in_fds[i], +if (!__xn_access_ok (curr,VERIFY_WRITE , + ufd_sets[i],sizeof (fd_set)) || +__xn_copy_from_user (curr, in_fds[i], (void __user *) ufd_sets[i], -__FDELT (nfds + __NFDBITS -1 ) - *sizeof (long ))) + fds_size))return -EFAULT ; }