summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/kern/vfs_syscalls.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index ce4436a..c246b9e 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -435,6 +435,8 @@ sys_getfsstat(td, uap)
size_t count;
int error;
+ if (uap->bufsize < 0 || uap->bufsize > SIZE_MAX)
+ return (EINVAL);
error = kern_getfsstat(td, &uap->buf, uap->bufsize, &count,
UIO_USERSPACE, uap->flags);
if (error == 0)
@@ -625,13 +627,18 @@ freebsd4_getfsstat(td, uap)
size_t count, size;
int error;
+ if (uap->bufsize < 0)
+ return (EINVAL);
count = uap->bufsize / sizeof(struct ostatfs);
+ if (count > SIZE_MAX / sizeof(struct statfs))
+ return (EINVAL);
size = count * sizeof(struct statfs);
error = kern_getfsstat(td, &buf, size, &count, UIO_SYSSPACE,
uap->flags);
- if (size > 0) {
+ td->td_retval[0] = count;
+ if (size != 0) {
sp = buf;
- while (count > 0 && error == 0) {
+ while (count != 0 && error == 0) {
cvtstatfs(sp, &osb);
error = copyout(&osb, uap->buf, sizeof(osb));
sp++;
@@ -640,8 +647,6 @@ freebsd4_getfsstat(td, uap)
}
free(buf, M_TEMP);
}
- if (error == 0)
- td->td_retval[0] = count;
return (error);
}
OpenPOWER on IntegriCloud