diff options
| author | kib <kib@FreeBSD.org> | 2013-10-25 16:33:24 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2013-10-25 16:33:24 +0000 |
| commit | 3056ea94bbf733ca0aeeb7772efef40884382338 (patch) | |
| tree | 8cdc43bc7a031b40ce768ad7193ec70f127507b9 | |
| parent | f2cf20f78fcdd44d412de89a584d6d98ef5c585c (diff) | |
| download | FreeBSD-src-3056ea94bbf733ca0aeeb7772efef40884382338.zip FreeBSD-src-3056ea94bbf733ca0aeeb7772efef40884382338.tar.gz | |
MFC r256502:
Similar to debug.iosize_max_clamp sysctl, introduce
devfs_iosize_max_clamp sysctl, which allows/disables SSIZE_MAX-sized
i/o requests on the devfs files.
Approved by: re (glebius)
| -rw-r--r-- | sys/fs/devfs/devfs_vnops.c | 4 | ||||
| -rw-r--r-- | sys/kern/sys_generic.c | 4 | ||||
| -rw-r--r-- | sys/sys/systm.h | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index dcc10c87..a05299a 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -1178,6 +1178,8 @@ devfs_read_f(struct file *fp, struct uio *uio, struct ucred *cred, struct cdevsw *dsw; struct file *fpop; + if (uio->uio_resid > DEVFS_IOSIZE_MAX) + return (EINVAL); fpop = td->td_fpop; error = devfs_fp_check(fp, &dev, &dsw, &ref); if (error) @@ -1653,6 +1655,8 @@ devfs_write_f(struct file *fp, struct uio *uio, struct ucred *cred, struct cdevsw *dsw; struct file *fpop; + if (uio->uio_resid > DEVFS_IOSIZE_MAX) + return (EINVAL); fpop = td->td_fpop; error = devfs_fp_check(fp, &dev, &dsw, &ref); if (error) diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index d4d6293..13ccb58 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -78,6 +78,10 @@ __FBSDID("$FreeBSD$"); int iosize_max_clamp = 1; SYSCTL_INT(_debug, OID_AUTO, iosize_max_clamp, CTLFLAG_RW, &iosize_max_clamp, 0, "Clamp max i/o size to INT_MAX"); +int devfs_iosize_max_clamp = 1; +SYSCTL_INT(_debug, OID_AUTO, devfs_iosize_max_clamp, CTLFLAG_RW, + &devfs_iosize_max_clamp, 0, "Clamp max i/o size to INT_MAX for devices"); + /* * Assert that the return value of read(2) and write(2) syscalls fits * into a register. If not, an architecture will need to provide the diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 2000e92..b86f7a2 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -146,7 +146,9 @@ extern const void *zero_region; /* address space maps to a zeroed page */ extern int unmapped_buf_allowed; extern int iosize_max_clamp; +extern int devfs_iosize_max_clamp; #define IOSIZE_MAX (iosize_max_clamp ? INT_MAX : SSIZE_MAX) +#define DEVFS_IOSIZE_MAX (devfs_iosize_max_clamp ? INT_MAX : SSIZE_MAX) /* * General function declarations. |
