ppc: kvm: use anon_inode_getfd() with O_CLOEXEC flag

KVM uses anon_inode_get() to allocate file descriptors as part of some of its ioctls. But those ioctls are lacking a flag argument allowing userspace to choose options for the newly opened file descriptor. In such case it's advised to use O_CLOEXEC by default so that userspace is allowed to choose, without race, if the file descriptor is going to be inherited across exec(). This patch set O_CLOEXEC flag on all file descriptors created with anon_inode_getfd() to not leak file descriptors across exec().

Yann Droneaud committed 13 years ago

Commit 2f84d5e1 parent 24009b03 files · +3 −3Browse files

Unified · Split

3 files

arch/powerpc/kvm/book3s_64_mmu_hv.c +1 −1
arch/powerpc/kvm/book3s_64_vio.c +1 −1
arch/powerpc/kvm/book3s_hv.c +1 −1

arch/powerpc/kvm/book3s_64_mmu_hv.c+1−1

@@ -1579,7 +1579,7 @@ int kvm_vm_ioctl_get_htab_fd(struct kvm kvm, struct kvm_get_htab_fd ghf) · 1578 unmodified lines
1579	ctx->first_pass = 1;	1579	ctx->first_pass = 1;
1580		1580
1581	rwflag = (ghf->flags & KVM_GET_HTAB_WRITE) ? O_WRONLY : O_RDONLY;	1581	rwflag = (ghf->flags & KVM_GET_HTAB_WRITE) ? O_WRONLY : O_RDONLY;
1582	ret = anon_inode_getfd("kvm-htab", &kvm_htab_fops, ctx, rwflag);	1582	ret = anon_inode_getfd("kvm-htab", &kvm_htab_fops, ctx, rwflag \| O_CLOEXEC);
1583	if (ret < 0) {	1583	if (ret < 0) {
1584	kvm_put_kvm(kvm);	1584	kvm_put_kvm(kvm);
1585	return ret;	1585	return ret;

arch/powerpc/kvm/book3s_64_vio.c+1−1

@@ -136,7 +136,7 @@ long kvm_vm_ioctl_create_spapr_tce(struct kvm *kvm, · 135 unmodified lines
136	mutex_unlock(&kvm->lock);	136	mutex_unlock(&kvm->lock);
137		137
138	return anon_inode_getfd("kvm-spapr-tce", &kvm_spapr_tce_fops,	138	return anon_inode_getfd("kvm-spapr-tce", &kvm_spapr_tce_fops,
139	stt, O_RDWR);	139	stt, O_RDWR \| O_CLOEXEC);
140		140
141	fail:	141	fail:
142	if (stt) {	142	if (stt) {

arch/powerpc/kvm/book3s_hv.c+1−1

@@ -1556,7 +1556,7 @@ long kvm_vm_ioctl_allocate_rma(struct kvm kvm, struct kvm_allocate_rma ret) · 1555 unmodified lines
1556	if (!ri)	1556	if (!ri)
1557	return -ENOMEM;	1557	return -ENOMEM;
1558		1558
1559	fd = anon_inode_getfd("kvm-rma", &kvm_rma_fops, ri, O_RDWR);	1559	fd = anon_inode_getfd("kvm-rma", &kvm_rma_fops, ri, O_RDWR \| O_CLOEXEC);
1560	if (fd < 0)	1560	if (fd < 0)
1561	kvm_release_rma(ri);	1561	kvm_release_rma(ri);
1562		1562