diff options
| author | pjd <pjd@FreeBSD.org> | 2013-05-23 21:07:26 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2013-05-23 21:07:26 +0000 |
| commit | 4a0d14c9b4f528ea5ab081d3ee4a7c3d56549555 (patch) | |
| tree | a3bcfecf9f04f671b5d6c78fb46073caa6512c92 /sys/kern | |
| parent | 5e9a14d6464f5bb381f1daa4a07b9698e1be16eb (diff) | |
| download | FreeBSD-src-4a0d14c9b4f528ea5ab081d3ee4a7c3d56549555.zip FreeBSD-src-4a0d14c9b4f528ea5ab081d3ee4a7c3d56549555.tar.gz | |
Use proper malloc type for ioctls white-list.
Reported by: pho
Tested by: pho
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/sys_capability.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/kern/sys_capability.c b/sys/kern/sys_capability.c index ba168e9..399d0b1 100644 --- a/sys/kern/sys_capability.c +++ b/sys/kern/sys_capability.c @@ -144,6 +144,8 @@ sys_cap_getmode(struct thread *td, struct cap_getmode_args *uap) FEATURE(security_capabilities, "Capsicum Capabilities"); +MALLOC_DECLARE(M_FILECAPS); + static inline int _cap_check(cap_rights_t have, cap_rights_t need, enum ktr_cap_fail_type type) { @@ -229,7 +231,7 @@ sys_cap_rights_limit(struct thread *td, struct cap_rights_limit_args *uap) if (error == 0) { fdp->fd_ofiles[fd].fde_rights = rights; if ((rights & CAP_IOCTL) == 0) { - free(fdp->fd_ofiles[fd].fde_ioctls, M_TEMP); + free(fdp->fd_ofiles[fd].fde_ioctls, M_FILECAPS); fdp->fd_ofiles[fd].fde_ioctls = NULL; fdp->fd_ofiles[fd].fde_nioctls = 0; } @@ -344,10 +346,10 @@ sys_cap_ioctls_limit(struct thread *td, struct cap_ioctls_limit_args *uap) if (ncmds == 0) { cmds = NULL; } else { - cmds = malloc(sizeof(cmds[0]) * ncmds, M_TEMP, M_WAITOK); + cmds = malloc(sizeof(cmds[0]) * ncmds, M_FILECAPS, M_WAITOK); error = copyin(uap->cmds, cmds, sizeof(cmds[0]) * ncmds); if (error != 0) { - free(cmds, M_TEMP); + free(cmds, M_FILECAPS); return (error); } } @@ -372,7 +374,7 @@ sys_cap_ioctls_limit(struct thread *td, struct cap_ioctls_limit_args *uap) error = 0; out: FILEDESC_XUNLOCK(fdp); - free(cmds, M_TEMP); + free(cmds, M_FILECAPS); return (error); } @@ -548,7 +550,7 @@ sys_cap_new(struct thread *td, struct cap_new_args *uap) */ fdp->fd_ofiles[newfd].fde_rights = rights; if ((rights & CAP_IOCTL) == 0) { - free(fdp->fd_ofiles[newfd].fde_ioctls, M_TEMP); + free(fdp->fd_ofiles[newfd].fde_ioctls, M_FILECAPS); fdp->fd_ofiles[newfd].fde_ioctls = NULL; fdp->fd_ofiles[newfd].fde_nioctls = 0; } |
